Bump version to 3.6.2

Update NEWS

.gitignore

@@ -16,6 +16,7 @@ config.log
 config.status
 config
 configure
+data/50-gnome-shell-*.xml
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
 data/gnome-shell-extension-prefs.desktop
@@ -44,6 +45,7 @@ intltool-merge.in
 intltool-update.in
 libtool
 m4/
+man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot

HACKING

@@ -0,0 +1,331 @@
+Coding guide
+============
+
+Our goal is to have all JavaScript code in GNOME follow a consistent style. In
+a dynamic language like JavaScript, it is essential to be rigorous about style
+(and unit tests), or you rapidly end up with a spaghetti-code mess.
+
+A quick note
+------------
+
+Life isn't fun if you can't break the rules. If a rule seems unnecessarily
+restrictive while you're coding, ignore it, and let the patch reviewer decide
+what to do.
+
+Indentation and whitespace
+--------------------------
+
+Use four-space indents. Braces are on the same line as their associated
+statements.  You should only omit braces if *both* sides of the statement are
+on one line.
+
+* One space after the `function` keyword.  No space between the function name
+* in a declaration or a call.  One space before the parens in the `if`
+* statements, or `while`, or `for` loops.
+
+    function foo(a, b) {
+        let bar;
+
+        if (a > b)
+            bar = do_thing(a);
+        else
+            bar = do_thing(b);
+
+        if (var == 5) {
+            for (let i = 0; i < 10; i++) {
+                print(i);
+            }
+        } else {
+            print(20);
+        }
+    }
+
+Semicolons
+----------
+
+JavaScript allows omitting semicolons at the end of lines, but don't. Always
+end statements with a semicolon.
+
+js2-mode
+--------
+
+If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a
+while. emacs now has a built-in JavaScript mode, js-mode, based on
+espresso-mode. It is the de facto emacs mode for JavaScript.
+
+File naming and creation
+------------------------
+
+For JavaScript files, use lowerCamelCase-style names, with a `.js` extension.
+
+We only use C where gjs/gobject-introspection is not available for the task, or
+where C would be cleaner. To work around limitations in
+gjs/gobject-introspection itself, add a new method in `shell-util.[ch]`.
+
+Like many other GNOME projects, we prefix our C source filenames with the
+library name followed by a dash, e.g. `shell-app-system.c`. Create a
+`-private.h` header when you want to share code internally in the
+library. These headers are not installed, distributed or introspected.
+
+Imports
+-------
+
+Use UpperCamelCase when importing modules to distinguish them from ordinary
+variables, e.g.
+
+    const GLib = imports.gi.GLib;
+
+Imports should be categorized into one of two places. The top-most import block
+should contain only "environment imports". These are either modules from
+gobject-introspection or modules added by gjs itself.
+
+The second block of imports should contain only "application imports". These
+are the JS code that is in the gnome-shell codebase,
+e.g. `imports.ui.popupMenu`.
+
+Each import block should be sorted alphabetically. Don't import modules you
+don't use.
+
+    const GLib = imports.gi.GLib;
+    const Gio = imports.gi.Gio;
+    const Lang = imports.lang;
+    const St = imports.gi.St;
+
+    const Main = imports.ui.main;
+    const Params = imports.misc.params;
+    const Tweener = imports.ui.tweener;
+    const Util = imports.misc.util;
+
+The alphabetical ordering should be done independently of the location of the
+location. Never reference `imports` in actual code.
+
+Constants
+---------
+
+We use CONSTANTS_CASE to define constants. All constants should be directly
+under the imports:
+
+    const MY_DBUS_INTERFACE = 'org.my.Interface';
+
+Variable declaration
+--------------------
+
+Always use either `const` or `let` when defining a variable.
+
+    // Iterating over an array
+    for (let i = 0; i < arr.length; ++i) {
+        let item = arr[i];
+    }
+
+    // Iterating over an object's properties
+    for (let prop in someobj) {
+        ...
+    }
+
+If you use "var" then the variable is added to function scope, not block scope.
+See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29)
+
+Classes
+-------
+
+There are many approaches to classes in JavaScript. We use our own class framework
+(sigh), which is built in gjs. The advantage is that it supports inheriting from
+GObjects, although this feature isn't used very often in the Shell itself.
+
+    const IconLabelMenuItem = new Lang.Class({
+        Name: 'IconLabelMenuItem',
+        Extends: PopupMenu.PopupMenuBaseItem,
+
+        _init: function(icon, label) {
+            this.parent({ reactive: false });
+            this.addActor(icon);
+            this.addActor(label);
+        },
+
+        open: function() {
+            log("menu opened!");
+        }
+    });
+
+* 'Name' is required. 'Extends' is optional. If you leave it out, you will
+  automatically inherit from Object.
+
+* Leave a blank line between the "class header" (Name, Extends, and other
+  things)  and the "class body" (methods). Leave a blank line between each
+  method.
+
+* No space before the colon, one space after.
+
+* No trailing comma after the last item.
+
+* Make sure to use a semicolon after the closing paren to the class. It's
+  still a giant function call, even though it may resemble a more
+  conventional syntax.
+
+GObject Introspection
+---------------------
+
+GObject Introspection is a powerful feature that allows us to have native
+bindings for almost any library built around GObject. If a library requires
+you to inherit from a type to use it, you can do so:
+
+    const MyClutterActor = new Lang.Class({
+        Name: 'MyClutterActor',
+        Extends: Clutter.Actor,
+
+        vfunc_get_preferred_width: function(actor, forHeight) {
+             return [100, 100];
+        },
+
+        vfunc_get_preferred_height: function(actor, forWidth) {
+             return [100, 100];
+        },
+
+        vfunc_paint: function(actor) {
+             let alloc = this.get_allocation_box();
+             Cogl.set_source_color4ub(255, 0, 0, 255);
+             Cogl.rectangle(alloc.x1, alloc.y1,
+                            alloc.x2, alloc.y2);
+        }
+    });
+
+Translatable strings, `environment.js`
+--------------------------------------
+
+We use gettext to translate the GNOME Shell into all the languages that GNOME
+supports. The `gettext` function is aliased globally as `_`, you do not need to
+explicitly import it. This is done through some magic in the
+[environment.js](http://git.gnome.org/browse/gnome-shell/tree/js/ui/environment.js)
+file. If you can't find a method that's used, it's probably either in gjs itself
+or installed on the global object from the Environment.
+
+Use 'single quotes' for programming strings that should not be translated
+and "double quotes" for strings that the user may see. This allows us to
+quickly find untranslated or mistranslated strings by grepping through the
+sources for double quotes without a gettext call around them.
+
+`actor` and `_delegate`
+-----------------------
+
+gjs allows us to set so-called "expando properties" on introspected objects,
+allowing us to treat them like any other. Because the Shell was built before
+you could inherit from GTypes natively in JS, we usually have a wrapper class
+that has a property called `actor`. We call this wrapper class the "delegate".
+
+We sometimes use expando properties to set a property called `_delegate` on
+the actor itself:
+
+    const MyClass = new Lang.Class({
+        Name: 'MyClass',
+
+        _init: function() {
+            this.actor = new St.Button({ text: "This is a button" });
+            this.actor._delegate = this;
+
+            this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+        },
+
+        _onClicked: function(actor) {
+            actor.set_label("You clicked the button!");
+        }
+    });
+
+The 'delegate' property is important for anything which trying to get the
+delegate object from an associated actor. For instance, the drag and drop
+system calls the `handleDragOver` function on the delegate of a "drop target"
+when the user drags an item over it. If you do not set the `_delegate`
+property, your actor will not be able to be dropped onto.
+
+Functional style
+----------------
+
+JavaScript Array objects offer a lot of common functional programming
+capabilities such as forEach, map, filter and so on. You can use these when
+they make sense, but please don't have a spaghetti mess of function programming
+messed in a procedural style. Use your best judgment.
+
+Closures
+--------
+
+`this` will not be captured in a closure, it is relative to how the closure is
+invoked, not to the value of this where the closure is created, because "this"
+is a keyword with a value passed in at function invocation time, it is not a
+variable that can be captured in closures.
+
+All closures should be wrapped with a Lang.bind.
+
+    const Lang = imports.lang;
+
+    let closure = Lang.bind(this, function() { this._fnorbate(); });
+
+A more realistic example would be connecting to a signal on a method of a
+prototype:
+
+    const Lang = imports.lang;
+    const FnorbLib = imports.fborbLib;
+
+    const MyClass = new Lang.Class({
+        _init: function() {
+            let fnorb = new FnorbLib.Fnorb();
+            fnorb.connect('frobate', Lang.bind(this, this._onFnorbFrobate));
+        },
+
+        _onFnorbFrobate: function(fnorb) {
+            this._updateFnorb();
+        }
+    });
+
+Object literal syntax
+---------------------
+
+In JavaScript, these are equivalent:
+
+    foo = { 'bar': 42 };
+    foo = { bar: 42 };
+
+and so are these:
+
+    var b = foo['bar'];
+    var b = foo.bar;
+
+If your usage of an object is like an object, then you're defining "member
+variables." For member variables, use the no-quotes no-brackets syntax: `{ bar:
+42 }` `foo.bar`.
+
+If your usage of an object is like a hash table (and thus conceptually the keys
+can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
+}`, `foo['bar']`.
+
+Getters, setters, and Tweener
+-----------------------------
+
+Getters and setters should be used when you are dealing with an API that is
+designed around setting properties, like Tweener. If you want to animate an
+arbitrary property, create a getter and setter, and use Tweener to animate the
+property.
+
+    const ANIMATION_TIME = 2000;
+
+    const MyClass = new Lang.Class({
+        Name: 'MyClass',
+
+        _init: function() {
+            this.actor = new St.BoxLayout();
+            this._position = 0;
+        },
+
+        get position() {
+            return this._position;
+        },
+
+        set position(value) {
+            this._position = value;
+            this.actor.set_position(value, value);
+        }
+    });
+
+    let myThing = new MyClass();
+    Tweener.addTween(myThing,
+                     { position: 100,
+                       time: ANIMATION_TIME,
+                       transition: 'easeOutQuad' });

Makefile.am

@@ -1,7 +1,11 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data js src browser-plugin tests po man docs
+SUBDIRS = data js src browser-plugin tests po docs
+
+if ENABLE_MAN
+SUBDIRS += man
+endif
 
 EXTRA_DIST =		\
 	.project	\
@@ -13,6 +17,7 @@ EXTRA_DIST =		\
 DIST_EXCLUDE =					\
 	.gitignore				\
 	gnome-shell.doap			\
+	HACKING					\
 	MAINTAINERS				\
 	tools/build/*
 
@@ -20,4 +25,4 @@ distcheck-hook:
 	@echo "Checking disted files against files in git"
 	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man

NEWS

@@ -1,3 +1,189 @@
+3.6.2
+=====
+* Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
+* Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
+* Set Empathy as preferred handler when delegating channels [Xavier; #686296]
+* Tweak screenShield animations [Rui; #686745]
+* Restore Fittsability of summary items in message tray [Florian; #686474]
+* App search: Match GenericName too [Matthias; #687121]
+* Add setting to force log out menuitem [Matthias; #686057]
+* Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
+* Update man page [Matthias; #680601]
+* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* Fix screenshots on Big Endian [Owen; #685915]
+* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Misc bugfixes [Jasper, Florian, Giovanni, Matthew, Matthias, Alejandro,
+  Sebastian; #686233, #686484, #686487, #686630, #686728, #686574, #686574,
+  #686574, #686879, #686763, #685239, #687189, #686736, #686583, #687132,
+  #687958, #687020, #687708, #686888, #686530, #684810, #688181]
+
+Contributors:
+  Matthew Barnes, Giovanni Campagna, Xavier Claessens, Matthias Clasen,
+  Sebastian Keller, Tim Lunn, Rui Matos, Florian Müllner, Alejandro Piñeiro,
+  Sjoerd Simons, Jasper St. Pierre, Ray Strode, Owen Taylor
+
+Translations:
+  Takayuki KUSANO [ja], Dušan Kazik [sk], Mattias Põldaru [et],
+  Tom Tryfonidis [el], Sweta Kothari [gu], Matej Urbančič [sl], Piotr Drąg [pl],
+  Fran Diéguez [gl], Aurimas Černius [lt], Kjartan Maraas [nb],
+  Ihar Hrachyshka [be], Мирослав Николић [sr, sr@latin], Gil Forcada [ca],
+  A S Alam [pa], Yuri Myasoedov [ru], Marek Černocký [cs], Sweta Kothari [gu],
+  Wolfgang Stöggl [de], Daniel Mustieles [es]
+
+3.6.1
+=====
+* dash: Make padding even on the top/bottom of the dash [Jasper; #684619]
+* Fix a crash when dragging search results [Jasper; #684888]
+* workspaceThumbnail: Fix dragging with static workspaces [Jasper; #684641]
+* Really hide 'Show Keyboard Layout' on the lock screen [Matthias]
+* Misc. improvements to jhbuild setup [Owen; #685352, #685353, #685354, #685355]
+* Show message tray in Ctrl+Alt+Tab outside of the overview [Jasper, Florian;
+  #684633, #685914]
+* Disable hotplug sniffer on remote filesystems [Jasper; #684093]
+* userMenu: Remove 'Switch Session' item [Florian; #685062]
+* unlockDialog: Make prompt entry insensitive while logging in [Jasper; #685444]
+* messageTray: Don't animate desktop clone for failed grabs [Jasper; #685342]
+* Fix crash on dragging windows between workspaces [Ryan; #681399]
+* userMenu: Ignore 'lock-enabled' setting for user switching [Florian; #685536]
+* gdm: Fix key-focus on first user [Adel; #684650]
+* Make grid button insensitive when dragging non-favorites [Jasper; #685313]
+* Calendar: hide all actions when on the login screen [Matthias; #685142]
+* Adapt unlock dialog layout for the login screen [Florian; #685201]
+* Make focus-follows-mouse work better with Shell UI [Florian; #678169]
+* Improve look of screen shield [Jasper; #685919]
+* Fix keynav in the login screen [Florian; #684730]
+* dateMenu: Hide "Open Calendar" item if calendar unavailable [Florian; #686050]
+* unlockDialog: Reset UI on verification failure [Giovanni; #685441]
+* Show unlock dialog on primary monitor when using keynav [Giovanni; #685855]
+* Fix height changes of entries when entering text [Florian; #685534]
+* Fix show-apps label after successful drags [Florian; #684627]
+* Misc. bugfixes and cleanups [Jasper, Olivier, Florian, Owen, Adel, Tanner, Tim, Matthias; #685434, #685511, #685466, #685341, #685156, #681159, #673189, #686016, 684869, #686079, #686063
+
+Contributors:
+Jasper St. Pierre
+Matthias Clasen
+Owen Taylor
+Olivier Blin
+Florian Müllner
+Ryan Lortie
+Adel Gadllah
+Tanner Doshier
+Tim Lunn
+Giovanni Campagna
+
+Translations:
+  Tobias Endrigkeit [de], Rudolfs Mazurs [lv], Ask H. Larsen [da],
+  Shankar Prasad [kn], Changwoo Ryu [ko], Chris Leonard [en_GB],
+  Arash Mousavi [fa], Theppitak Karoonboonyanan [th], Seán de Búrca [ga],
+  Yaron Shahrabani [he], Alexander Shopov [bg], Žygimantas Beručka [lt],
+  Milo Casagrande [it], Kjartan Maraas [nb], Kris Thomsen [da],
+  Aurimas Černius [lt], Yuri Myasoedov [ru], Мирослав Николић [sr],
+  Marek Černocký [cs], Gabor Kelemen [hu], Ihar Hrachyshka [be],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Eleanor Chen [zh_CN],
+  Carles Ferrando [ca@valencia], Vicent Cubells [ca], Daniel Korostil [uk],
+  Alexandre Franke [fr], Piotr Drąg [pl]
+
+3.6.0
+=====
+* keyboard: Make input source items accessible [Florian; #684462]
+* Don't show network dialogs in the lock screen [Giovanni; #684384]
+* popupMenu: Fix initial visibility of settings items [Florian; #684473]
+* userMenu: Close menu immediately on user/session switch [Florian; #684459]
+* Fix alignment of search section headers in RTL locales [Florian; #684379]
+* screenShield: Fix unlock animation [Florian; #684591]
+* Don't open the tray from a dwell while in a modal grab [Jasper; #684458]
+* userMenu: Fix texture updates on icon changes [Florian; #679268]
+* Fix a11y support in the login screen [Florian, Ray; #684727, #684728, #684748]
+* Make On-Screen-Keyboard usable with new message tray [Giovanni, Florian;
+  #683546]
+* Fix initial visibility of input volume in lock-screen [Florian; #684611]
+
+Contributors:
+  Giovanni Campagna, Florian Müllner, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Matej Urbančič [sl], Dr.T.Vasudevan [ta], Piotr Drąg [pl], A S Alam [pa],
+  Alexander Shopov [bg], Nilamdyuti Goswami [as], Chandan Kumar [hi],
+  Khaled Hosny [ar], Ibrahim Saed [ar], Sandeep Sheshrao Shedmake [mr],
+  Tom Tryfonidis [el], Theppitak Karoonboonyanan [th], Alexandre Franke [fr],
+  Fran Diéguez [gl], Gabor Kelemen [hu], Ani Peter [ml], Daniel Mustieles [es],
+  Мирослав Николић [sr, sr@latin], Duarte Loreto [pt], ManojKumar Giri [or],
+  Ihar Hrachyshka [be], Aurimas Černius [lt], Djavan Fagundes [pt_BR],
+  Changwoo Ryu [ko], Bruce Cowan [en_GB], Kris Thomsen [da], Gil Forcada [ca],
+  Yaron Shahrabani [he], Milo Casagrande [it], Ville-Pekka Vainio [fi],
+  YunQiang Su [zh_CN], Carles Ferrando [ca@valencia], Mario Blättermann [de],
+  Rajesh Ranjan [hi], Yuri Myasoedov [ru], Rūdolfs Mazurs [lv],
+  Jiro Matsuzawa [ja], Mattias Põldaru [et], Timur Zhamakeev [ky],
+  Petr Kovar [cs], Chao-Hsiung Liao [zh_HK,zh_TW], Andika Triwidada [id]
+
+3.5.92
+======
+* Login/UnlockDialog: Don't reset immediately if auth fails [Giovanni; #682544]
+* Allow changing session mode at runtime [Jasper, Giovanni; #683156]
+* Add zoom out animation on login [Jasper; #683170]
+* Bluetooth: don't restrict the length of non numeric PINs [Giovanni; #683356]
+* Force chat notification to stay open when focusing entry [Debarshi; #682236]
+* Make sure the screen is fully locked before suspending [Giovanni; #683448]
+* st-texture-cache: Fix a case of distorted textures [Florian; #683483]
+* popupSubMenu: Fix padding for non-scrolled submenus [Florian; #683009]
+* popupMenu: Fix width changes on submenu open/close [Florian; #683485]
+* boxpointer: Avoid malformed boxpointer arrow [Debarshi; #680077]
+* Change stage background color to grey [Adel; #683514]
+* messageTray: Update style of summary counters [Debarshi; #682891]
+* Don't fail if a legacy tray icon has no WM_CLASS [Giovanni; #683724]
+* PolkitAgent: Fix a crash if there is no avatar [Giovanni; #683707]
+* Hide the a11y menu in the lock screen, but show it in the login screen
+  [Giovanni; #682542]
+* Fix show-apps button dropping off the dash [Florian; #683340]
+* Fix committing strings to shell entries from input method [Florian; #658325]
+* Make IBus display strings consistent with control-center [Rui; #683124]
+* Fix missing short codes for some input sources [Rui; #683613]
+* Remove support for long-press from entry context menus [Jasper; #683509]
+* screenShield: Add box-shadow to the shield [Florian]
+* Don't show a right-click menu for the hotplug source [Jasper; #683438]
+* Fix extension styling [Giovanni; #682128]
+* Fix on-screen keyboard not working with system-modal dialogs
+  [Giovanni; #664309]
+* Fix insensitive styling for popup menu items [Giovanni; #683988]
+* Disable the message tray dwell when the user is interacting [Owen; #683811]
+* Animate going from the unlock dialog to the lock screen [Giovanni; #681143]
+* Autostart fprintd when necessary [Ray; #683131]
+* UnlockDialog: Allow typing before the first PAM question [Giovanni; #681576]
+* Make Return key dismiss screenshield [Ray; #683889]
+* Fix keyboard navigation in the message tray [Florian; #682243]
+* Remove the places & devices search provider [Giovanni; #683506]
+* Enable hot corner while the message tray is up [Florian; #682255]
+* Port screen recorder to new GStreamer vp8enc API [Adel; #684206]
+* Fix fish flickering [Giovanni; #684154]
+* Fix extension ordering with !important [Jasper; #684163]
+* Allow the shell to run without the screenshield [Giovanni; #683060]
+* Add menu items for IBus Anthy's InputMode, TypingMode [Rui; #682314]
+* Improve transition to the login dialog [Jasper; #682428]
+* Keep unlock dialog around until shield animation ends [Florian; #684342]
+* Expose shell keybindings in System Settings [Florian; #671010]
+* Misc. bugfixes and cleanups [Debarshi, Florian, Giovanni, Jasper, Rico, Rui;
+  #672790, #677434, #683305, #683357, #683369, #683377, #683378, #683400,
+  #683449, #683472, #683482, #683487, #683488, #683526, #683529, #683546,
+  #683583, #683628, #683705, #683982, #683989, #684035, #684036, #684040,
+  #684162, #684214, #684343]
+
+Contributors:
+  Giovanni Campagna, Adel Gadllah, Rui Matos, Florian Müllner, Debarshi Ray,
+  Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz
+
+Translations:
+  Gabor Kelemen [hu], Piotr Drąg [pl], Khaled Hosny [ar],
+  Мирослав Николић [sr, sr@latin], Chao-Hsiung Liao [zh_HK, zh_TW],
+  Bruce Cowan [en_GB], Dirgita [id], Tom Tryfonidis [el], Timo Jyrinki [fi],
+  Adorilson Bezerra [pt_BR], Arash Mousavi [fa], Matej Urbančič [sl],
+  Christian Kirbach [de], Yaron Shahrabani [he], Ihar Hrachyshka [be],
+  Changwoo Ryu [ko], Duarte Loreto [pt], Theppitak Karoonboonyanan [th],
+  Nilamdyuti Goswami [as], Sandeep Sheshrao Shedmake [mr],
+  Alexandre Franke [fr], Ivaylo Valkov [bg], tuhaihe [zh_CN],
+  Yuri Myasoedov [ru], Aurimas Černius [lt], Andika Triwidada [id],
+  Rajesh Ranjan [hi], Sweta Kothari [gu], Daniel Mustieles [es],
+  Fran Diéguez [gl], Praveen Illa [te]
+
 3.5.91
 ======
 * Improve modal dialog styling of network secret prompts [Jasper; #682412]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.5.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.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])
@@ -36,6 +36,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 PKG_PROG_PKG_CONFIG([0.22])
 
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+
 GLIB_GSETTINGS
 
 # Get a value to substitute into gnome-shell.in
@@ -63,7 +65,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.11.11
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
-MUTTER_MIN_VERSION=3.5.91
+MUTTER_MIN_VERSION=3.6.2
 GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=3.5.3
@@ -106,6 +108,9 @@ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 
 PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 
+GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
+AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
+
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 saved_CFLAGS=$CFLAGS
@@ -136,7 +141,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.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 libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
+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)
 AC_SUBST(CALENDAR_SERVER_LIBS)
 
@@ -205,6 +210,18 @@ AC_SUBST(TYPELIBDIR)
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
+AC_ARG_ENABLE(man,
+              [AS_HELP_STRING([--enable-man],
+                              [generate man pages [default=yes]])],,
+              enable_man=yes)
+if test "$enable_man" != no; then
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    AC_MSG_ERROR([xsltproc is required for --enable-man])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+
 # Stay command-line compatible with the gnome-common configure option. Here
 # minimum/yes/maximum are the same, however.
 AC_ARG_ENABLE(compile_warnings,

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/50-gnome-shell-system.xml.in

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.shell.keybindings"
+                group="system"
+                _name="System"
+                wm_name="GNOME Shell"
+                package="gnome-shell">
+
+	<KeyListEntry name="toggle-message-tray"
+                      _description="Show the message tray"/>
+
+</KeyListEntries>
+

data/Makefile.am

@@ -39,6 +39,7 @@ dist_theme_DATA =				\
 	theme/process-working.svg		\
 	theme/running-indicator.svg		\
 	theme/source-button-border.svg		\
+	theme/summary-counter.svg		\
 	theme/toggle-off-us.svg			\
 	theme/toggle-off-intl.svg		\
 	theme/toggle-on-us.svg			\
@@ -46,6 +47,13 @@ dist_theme_DATA =				\
 	theme/ws-switch-arrow-up.png		\
 	theme/ws-switch-arrow-down.png
 
+keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
+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
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -72,12 +80,14 @@ EXTRA_DIST =						\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
+	$(keys_in_files)				\
 	org.gnome.shell.gschema.xml.in.in
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
+	$(keys_DATA)					\
 	$(gsettings_SCHEMAS)				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\

data/org.gnome.ShellSearchProvider.xml

@@ -108,7 +108,7 @@
           </doc:summary>
         </doc:doc>
       </arg>
-      <arg type="a{sv}" direction="out">
+      <arg type="aa{sv}" direction="out">
         <doc:doc>
           <doc:summary>
             <doc:para>

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

@@ -39,10 +39,6 @@
         will be displayed in the favorites area.
       </_description>
     </key>
-    <key name="disabled-open-search-providers" type="as">
-      <default>[]</default>
-      <_summary>disabled OpenSearch providers</_summary>
-    </key>
     <key name="command-history" type="as">
       <default>[]</default>
       <_summary>History for command (Alt-F2) dialog</_summary>
@@ -61,6 +57,14 @@ value here is from the TpConnectionPresenceType enumeration.</_summary>
       <_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' menuitem in the user menu.</_summary>
+      <_description>
+        This key overrides the automatic hiding of the 'Log out'
+        menuitem in single-user, single-session situations.
+      </_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"/>
@@ -136,7 +140,7 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         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 quality=8 speed=6 threads=%T ! queue ! webmmux'
+        '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>
@@ -194,5 +198,13 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
       </description>
     </key>
+
+    <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>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
   </schema>
 </schemalist>

data/theme/gnome-shell.css

@@ -151,11 +151,11 @@ StScrollBar StButton#vhandle:active {
     box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
 }
 
-.popup-sub-menu .popup-menu-item:ltr {
+.popup-sub-menu:scrolled .popup-menu-item:ltr {
     padding-right: 0em;
 }
 
-.popup-sub-menu .popup-menu-item:rtl {
+.popup-sub-menu:scrolled .popup-menu-item:rtl {
     padding-left: 0em;
 }
 
@@ -195,7 +195,7 @@ StScrollBar StButton#vhandle:active {
     background-color: #4c4c4c;
 }
 
-StButton.popup-menu-item:insensitive {
+.popup-menu-item:insensitive {
     color: #9f9f9f;
 }
 
@@ -234,13 +234,18 @@ StButton.popup-menu-item:insensitive {
     spacing: .5em;
 }
 
-.popup-inactive-menu-item {
+.popup-status-menu-item {
     font-weight: normal;
     color: #999;
 }
 
-.popup-subtitle-menu-item {
+.popup-inactive-menu-item, .popup-inactive-menu-item:insensitive {
+    color: white;
+}
+
+.popup-subtitle-menu-item, .popup-subtitle-menu-item:insensitive {
     font-weight: bold;
+    color: white;
 }
 
 .popup-menu-icon {
@@ -336,7 +341,7 @@ StButton.popup-menu-item:insensitive {
     caret-color: rgb(64, 64, 64);
     font-size: 12pt;
     caret-size: 1px;
-    selected-color: black;
+    selected-color: white;
     padding: 4px 12px;
 }
 
@@ -397,6 +402,8 @@ StButton.popup-menu-item:insensitive {
 .login-dialog-prompt-entry:insensitive {
     color: rgba(0,0,0,0.7);
     border: 2px solid #565656;
+    background-gradient-start: rgb(200,200,200);
+    background-gradient-end: rgb(210,210,210);
 }
 
 /* Panel */
@@ -607,9 +614,9 @@ StButton.popup-menu-item:insensitive {
 
 .window-close, .notification-close {
     background-image: url("close-window.svg");
-    background-size: 34px;
-    height: 34px;
-    width: 34px;
+    background-size: 32px;
+    height: 32px;
+    width: 32px;
 }
 
 .window-close {
@@ -620,12 +627,12 @@ StButton.popup-menu-item:insensitive {
     /* we start out in the top right of the
      * notification, inset.
      *
-     * center is 32px/2 = 17px
+     * center is 32px/2 = 16px
      *
      * adjust left 2px
      * adjust down 8px */
 
-    -shell-close-overlap-x: 15px;
+    -shell-close-overlap-x: 14px;
     -shell-close-overlap-y: 12px;
 }
 
@@ -651,11 +658,6 @@ StButton.popup-menu-item:insensitive {
     border-radius: 9px 0px 0px 9px;
 }
 
-#dash:empty {
-    height: 100px;
-    width: 60px;
-}
-
 .placeholder {
     background-image: url("dash-placeholder.svg");
     background-size: contain;
@@ -720,10 +722,6 @@ StButton.popup-menu-item:insensitive {
     spacing: 4px;
 }
 
-.search-providers-box {
-    spacing: 12px;
-}
-
 /* Text labels are an odd number of pixels tall. The uneven top and bottom
  * padding compensates for this and ensures that the label is vertically
  * centered */
@@ -1190,12 +1188,16 @@ StButton.popup-menu-item:insensitive {
     background: #2e3436 url(message-tray-background.png);
     background-repeat: repeat;
     transition-duration: 250;
-    height: 72px;
+}
+
+#message-tray:keyboard {
+    /* Same as the OSK */
+    background: rgba(0, 0, 0, 0.8);
 }
 
 #message-tray:overview {
     background: rgba(0, 0, 0, 0.1);
-    border-top: 1px solid rgba(128, 128, 128, 0.3);
+    outline: 1px solid rgba(128, 128, 128, 0.3);
 }
 
 .notification {
@@ -1417,38 +1419,45 @@ StButton.popup-menu-item:insensitive {
 }
 
 #summary-mode {
-    padding: 0px 6px 0px 6px; /* same as the values in .summary-source */
-    height: 60px;
-    spacing: 10px;
+    height: 72px;
 }
 
 .summary-source-button {
-    border-radius: 4px;
-    transition-duration: 100;
+    padding: 6px 3px 6px 3px;
 }
 
-.summary-source-button:hover {
+.summary-source-button:last-child:ltr {
+    padding-right: 6px;
+}
+
+.summary-source-button:last-child:rtl {
+    padding-left: 6px;
+}
+
+.summary-source-button:hover .summary-source {
     background-color: rgba(255,255,255,0.1);
 }
 
-.summary-source-button:focus,
-.summary-source-button:selected {
+.summary-source-button:focus .summary-source,
+.summary-source-button:selected .summary-source {
     background-color: rgba(255,255,255,0.33);
 }
 
 .summary-source {
-    padding-right: 6px;
-    padding-left: 6px;
+    border-radius: 4px;
+    padding: 0 6px 0 6px;
+    transition-duration: 100;
 }
 
 .summary-source-counter {
-    color: white;
-    background-color: #3465A4;
-    text-shadow: black 1px 1px 0;
-    font-size: 9pt;
-    border-radius: 1em;
-    min-height: 1em;
-    min-width: 1em;
+    background-image: url("summary-counter.svg");
+    background-size: 2.5em;
+    font-size: 10pt;
+    font-weight: bold;
+    height: 2.5em;
+    width: 2.5em;
+    -shell-counter-overlap-x: 4px;
+    -shell-counter-overlap-y: 4px;
 }
 
 /* App Switcher */
@@ -2024,7 +2033,6 @@ StButton.popup-menu-item:insensitive {
 }
 
 .login-dialog-user-list-item {
-    color: #666666;
     border-radius: 10px;
     padding: .2em;
 }
@@ -2042,6 +2050,11 @@ StButton.popup-menu-item:insensitive {
     padding-left: 1em;
 }
 
+.login-dialog-user-list:expanded .login-dialog-user-list-item {
+    color: #666666;
+}
+
+.login-dialog-user-list-item,
 .login-dialog-user-list-item:hover .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:focus .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
@@ -2089,6 +2102,7 @@ StButton.popup-menu-item:insensitive {
     padding-top: 1em;
 }
 
+.login-dialog-not-listed-button:focus .login-dialog-not-listed-label,
 .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
     color: #E8E8E8;
 }
@@ -2171,13 +2185,23 @@ StButton.popup-menu-item:insensitive {
     padding: 3px 18px;
 }
 
+.login-dialog .modal-dialog-button:focus {
+    padding: 2px 17px;
+    border: 2px solid #8b8b8b;
+}
+
 .login-dialog .modal-dialog-button:default {
     background-gradient-start: #6793c4;
     background-gradient-end: #335d8f;
     background-gradient-direction: vertical;
+    padding: 2px 17px;
     border: 2px solid #16335d;
 }
 
+.login-dialog .modal-dialog-button:default:focus {
+    border: 2px solid #377fe7;
+}
+
 .login-dialog .modal-dialog-button:default:hover {
     background-gradient-start: #74a0d0;
     background-gradient-end: #436d9f;
@@ -2189,12 +2213,21 @@ StButton.popup-menu-item:insensitive {
     background-gradient-end: #74a0d0;
 }
 
+.login-dialog-message-warning {
+    color: orange;
+}
+
 .unlock-dialog-user-name-container {
     spacing: .4em;
 }
 
 /* Screen shield */
 
+.screen-shield-background {
+    background: black;
+    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
+}
+
 #lockDialogGroup {
     background: #2e3436 url(noise-texture.png);
     background-repeat: repeat;
@@ -2212,6 +2245,10 @@ StButton.popup-menu-item:insensitive {
     -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4);
 }
 
+.screen-shield-contents-box {
+    spacing: 48px;
+}
+
 .screen-shield-clock {
     color: white;
     text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
@@ -2221,12 +2258,12 @@ StButton.popup-menu-item:insensitive {
 }
 
 .screen-shield-clock-time {
-    font-size: 86px;
+    font-size: 72pt;
     text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
 }
 
 .screen-shield-clock-date {
-    font-size: 48px;
+    font-size: 28pt;
 }
 
 #screenShieldNotifications {
@@ -2234,11 +2271,12 @@ StButton.popup-menu-item:insensitive {
     background-color: rgba(0.0, 0.0, 0.0, 0.9);
     border: 2px solid #868686;
     max-height: 500px;
-    padding: 12px 0;
+    padding: 18px 0;
+    box-shadow: .5em .5em 20px rgba(0, 0, 0, 0.5);
 }
 
 .screen-shield-notifications-box {
-    spacing: 12px;
+    spacing: 18px;
 }
 
 .screen-shield-notification-source {
@@ -2249,6 +2287,7 @@ StButton.popup-menu-item:insensitive {
 .screen-shield-notification-label {
     font-size: 1.2em;
     font-weight: bold;
+    color: #babdb6;
 }
 
 /* Remove background from notifications, otherwise

data/theme/summary-counter.svg

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 23.272727 23.272727"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="summary-counter.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2399"><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><defs
+     id="defs2397"><linearGradient
+       id="linearGradient3173"><stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop3175" /><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3177" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2401" /><filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter16494-4"
+       x="-0.20989846"
+       width="1.4197969"
+       y="-0.20903821"
+       height="1.4180764"><feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3282637"
+         id="feGaussianBlur16496-8" /></filter><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16498-6"
+       id="radialGradient16504-1"
+       cx="7.6582627"
+       cy="5.8191104"
+       fx="7.6582627"
+       fy="5.8191104"
+       r="8.6928644"
+       gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient16498-6"><stop
+         style="stop-color:#9FD0FF;stop-opacity:1"
+         offset="0"
+         id="stop16500-8" /><stop
+         style="stop-color:#3465A4;stop-opacity:1"
+         offset="1"
+         id="stop16502-0" /></linearGradient></defs><sodipodi:namedview
+     inkscape:window-height="709"
+     inkscape:window-width="1366"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#000000"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="15.386407"
+     inkscape:cy="13.739577"
+     inkscape:window-x="0"
+     inkscape:window-y="1179"
+     inkscape:current-layer="g16402-8"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1"><inkscape:grid
+       type="xygrid"
+       id="grid11246"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="g16402-8"
+     transform="translate(4.7533483,2.8238929)"><g
+       id="g3175-4"
+       transform="translate(-0.89995416,0.94028614)"><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0"
+         inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
+         xlink:href="#path2394-32"
+         style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
+         id="path16480-5"
+         inkscape:href="#path2394-32"
+         d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
+         transform="translate(0,1.028519)" /><path
+         clip-rule="evenodd"
+         d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
+         id="path2394-32"
+         style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0" /><g
+         id="g3172-6" /></g></g></svg>

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

@@ -29,8 +29,6 @@
   <chapter>
     <title>Search</title>
     <xi:include href="xml/shell-app-system.xml"/>
-    <xi:include href="xml/shell-contact-system.xml"/>
-    <xi:include href="xml/shell-doc-system.xml"/>
   </chapter>
   <chapter>
     <title>Tray Icons</title>
@@ -42,7 +40,6 @@
   <chapter>
     <title>Recorder</title>
     <xi:include href="xml/shell-recorder.xml"/>
-    <xi:include href="xml/shell-recorder-src.xml"/>
   </chapter>
   <chapter>
     <title>Integration helpers and utilities</title>

js/Makefile.am

@@ -1,3 +1,4 @@
+NULL =
 
 EXTRA_DIST = misc/config.js.in
 CLEANFILES = misc/config.js
@@ -37,8 +38,6 @@ nobase_dist_js_DATA = 	\
 	ui/altTab.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
-	ui/automountManager.js  \
-	ui/autorunManager.js    \
 	ui/boxpointer.js	\
 	ui/calendar.js		\
 	ui/checkBox.js		\
@@ -47,15 +46,14 @@ nobase_dist_js_DATA = 	\
 	ui/dateMenu.js		\
 	ui/dnd.js		\
 	ui/endSessionDialog.js	\
-	ui/environment.js	\
 	ui/extensionSystem.js	\
 	ui/extensionDownloader.js \
+	ui/environment.js	\
 	ui/flashspot.js		\
 	ui/ibusCandidatePopup.js\
 	ui/grabHelper.js	\
 	ui/iconGrid.js		\
 	ui/keyboard.js		\
-	ui/keyringPrompt.js	\
 	ui/layout.js		\
 	ui/lightbox.js		\
 	ui/lookingGlass.js	\
@@ -64,7 +62,6 @@ nobase_dist_js_DATA = 	\
 	ui/main.js		\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
-	ui/networkAgent.js	\
 	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
@@ -72,9 +69,7 @@ nobase_dist_js_DATA = 	\
 	ui/overview.js		\
 	ui/panel.js		\
 	ui/panelMenu.js		\
-	ui/placeDisplay.js	\
 	ui/pointerWatcher.js    \
-	ui/polkitAuthenticationAgent.js \
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
 	ui/runDialog.js		\
@@ -90,7 +85,6 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
-	ui/telepathyClient.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
 	ui/userMenu.js		\
@@ -102,4 +96,13 @@ nobase_dist_js_DATA = 	\
 	ui/workspaceThumbnail.js	\
 	ui/workspacesView.js	\
 	ui/workspaceSwitcherPopup.js    \
-	ui/xdndHandler.js
+	ui/xdndHandler.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

@@ -174,7 +174,7 @@ const Application = new Lang.Class({
         let renderer = new Gtk.CellRendererText();
         this._extensionSelector.pack_start(renderer, true);
         this._extensionSelector.add_attribute(renderer, 'text', 1);
-        this._extensionSelector.set_cell_data_func(renderer, Lang.bind(this, this._setExtensionInsensitive), null);
+        this._extensionSelector.set_cell_data_func(renderer, Lang.bind(this, this._setExtensionInsensitive));
         this._extensionSelector.connect('changed', Lang.bind(this, this._extensionSelected));
 
         toolitem = new Gtk.ToolItem({ child: this._extensionSelector });

js/gdm/fingerprint.js

@@ -19,8 +19,7 @@ function FprintManager() {
                                    g_interface_info: FprintManagerInfo,
                                    g_name: 'net.reactivated.Fprint',
                                    g_object_path: '/net/reactivated/Fprint/Manager',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
 
     self.init(null);
     return self;

js/gdm/loginDialog.js

@@ -25,6 +25,7 @@ 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 Signals = imports.signals;
@@ -105,6 +106,7 @@ const UserListItem = new Lang.Class({
         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,
@@ -148,14 +150,6 @@ const UserListItem = new Lang.Class({
         this.emit('activate');
     },
 
-    fadeOutName: function() {
-        return GdmUtil.fadeOutActor(this._nameLabel);
-    },
-
-    fadeInName: function() {
-        return GdmUtil.fadeInActor(this._nameLabel);
-    },
-
     showTimedLoginIndicator: function(time) {
         let hold = new Batch.Hold();
 
@@ -206,16 +200,18 @@ const UserList = new Lang.Class({
         if (global.stage.get_key_focus() != this.actor)
             return;
 
-        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        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;
+            }));
+        }
     },
 
     _showItem: function(item) {
         let tasks = [function() {
                          return GdmUtil.fadeInActor(item.actor);
-                     },
-
-                     function() {
-                         return item.fadeInName();
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -279,13 +275,16 @@ const UserList = new Lang.Class({
                 });
         }
 
-        this._box.remove_style_pseudo_class('expanded');
         let batch = new Batch.ConsecutiveBatch(this,
                                                [function() {
                                                     return GdmUtil.fadeOutActor(this.actor.vscroll);
                                                 },
 
-                                                new Batch.ConcurrentBatch(this, tasks)
+                                                new Batch.ConcurrentBatch(this, tasks),
+
+                                                function() {
+                                                    this._box.remove_style_pseudo_class('expanded');
+                                                }
                                                ]);
 
         return batch.run();
@@ -335,7 +334,6 @@ const UserList = new Lang.Class({
             });
         }
 
-        this._box.add_style_pseudo_class('expanded');
         let batch = new Batch.ConsecutiveBatch(this,
                                                [function() {
                                                     this.takeOverWhitespace();
@@ -346,6 +344,10 @@ const UserList = new Lang.Class({
                                                     return _smoothlyResizeActor(this._box, -1, fullHeight);
                                                 },
 
+                                                function() {
+                                                    this._box.add_style_pseudo_class('expanded');
+                                                },
+
                                                 new Batch.ConcurrentBatch(this, tasks),
 
                                                 function() {
@@ -471,6 +473,7 @@ const SessionListItem = new Lang.Class({
 
         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);
     },
@@ -625,8 +628,8 @@ const LoginDialog = new Lang.Class({
     _init: function(parentActor) {
         this.parent({ shellReactive: true,
                       styleClass: 'login-dialog',
-                      parentActor: parentActor
-                    });
+                      parentActor: parentActor,
+                      shouldFadeIn: false });
         this.connect('destroy',
                      Lang.bind(this, this._onDestroy));
         this.connect('opened',
@@ -647,11 +650,11 @@ const LoginDialog = new Lang.Class({
 
         this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient);
         this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-
+        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
+        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
         this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
         this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+        this._verifyingUser = false;
 
         this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
@@ -661,6 +664,8 @@ const LoginDialog = new Lang.Class({
                                Lang.bind(this, this._updateBanner));
         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                                Lang.bind(this, this._updateBanner));
+        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
+                               Lang.bind(this, this._updateDisableUserList));
 
         this._logoBox = new St.Bin({ style_class: 'login-dialog-logo-box' });
         this.contentLayout.add(this._logoBox);
@@ -672,37 +677,30 @@ const LoginDialog = new Lang.Class({
         this._updateBanner();
 
         this._titleLabel = new St.Label({ style_class: 'login-dialog-title',
-                                          text: C_("title", "Sign In") });
+                                          text: C_("title", "Sign In"),
+                                          visible: false });
 
         this.contentLayout.add(this._titleLabel,
                               { y_fill: false,
                                 y_align: St.Align.START });
 
-        let mainContentBox = new St.BoxLayout({ vertical: false });
-        this.contentLayout.add(mainContentBox,
+        this._userList = new UserList();
+        this.contentLayout.add(this._userList.actor,
                                { expand: true,
                                  x_fill: true,
-                                 y_fill: false });
-
-        this._userList = new UserList();
-        mainContentBox.add(this._userList.actor,
-                           { expand: true,
-                             x_fill: true,
-                             y_fill: true });
+                                 y_fill: true });
 
         this.setInitialKeyFocus(this._userList.actor);
 
         this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
                                              vertical: true });
-        mainContentBox.add(this._promptBox,
-                           { expand: true,
-                             x_fill: true,
-                             y_fill: true,
-                             x_align: St.Align.START });
+        this.contentLayout.add(this._promptBox,
+                               { expand: true,
+                                 x_fill: true,
+                                 y_fill: true,
+                                 x_align: St.Align.START });
         this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
 
-        this._mainContentBox = mainContentBox;
-
         this._promptBox.add(this._promptLabel,
                             { expand: true,
                               x_fill: true,
@@ -715,6 +713,10 @@ const LoginDialog = new Lang.Class({
                               x_fill: true,
                               y_fill: false,
                               x_align: St.Align.START });
+
+        this._promptMessage = new St.Label({ visible: false });
+        this._promptBox.add(this._promptMessage, { x_fill: true });
+
         this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
         this._promptLoginHint.hide();
         this._promptBox.add(this._promptLoginHint);
@@ -744,7 +746,7 @@ const LoginDialog = new Lang.Class({
                                                 x_align: St.Align.START,
                                                 x_fill: true });
 
-        this._notListedButton.connect('clicked', Lang.bind(this, this._onNotListedClicked));
+        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAndLogIn));
 
         this.contentLayout.add(this._notListedButton,
                                { expand: false,
@@ -768,6 +770,21 @@ const LoginDialog = new Lang.Class({
                                    this._onUserListActivated(item);
                                }));
 
+   },
+
+    _updateDisableUserList: function() {
+        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
+
+        // If this is the first time around, set initial focus
+        if (this._disableUserList == undefined && disableUserList)
+            this.setInitialKeyFocus(this._promptEntry);
+
+        if (disableUserList != this._disableUserList) {
+            this._disableUserList = disableUserList;
+
+            if (!this._verifyingUser)
+               this._reset();
+        }
    },
 
     _updateLogo: function() {
@@ -796,36 +813,31 @@ const LoginDialog = new Lang.Class({
         }
     },
 
-    _onReset: function(client, serviceName) {
-        let tasks = [this._hidePrompt,
-
-                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
-                                                      this._fadeInNotListedButton,
-                                                      this._fadeInLogo]),
-
-                     function() {
-                         this._sessionList.close();
-                         this._promptLoginHint.hide();
-                         this._userList.actor.show();
-                         this._userList.actor.opacity = 255;
-                         return this._userList.showItems();
-                     },
-
-                     function() {
-                         this._userList.actor.reactive = true;
-                         this._userList.actor.grab_key_focus();
-                     }];
-
+    _reset: function() {
+        this._promptMessage.hide();
         this._user = null;
+        this._verifyingUser = false;
 
-        let batch = new Batch.ConsecutiveBatch(this, tasks);
-        batch.run();
+        if (this._disableUserList)
+            this._hideUserListAndLogIn();
+        else
+            this._showUserList();
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {
         this._sessionList.setActiveSession(sessionId);
     },
 
+    _showMessage: function(userVerifier, message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            GdmUtil.fadeInActor(this._promptMessage);
+        } else {
+            GdmUtil.fadeOutActor(this._promptMessage);
+        }
+    },
+
     _showLoginHint: function(verifier, message) {
         this._promptLoginHint.set_text(message)
         GdmUtil.fadeInActor(this._promptLoginHint);
@@ -864,6 +876,9 @@ const LoginDialog = new Lang.Class({
                          if (this._user && this._user.is_logged_in())
                              return null;
 
+                         if (!this._verifyingUser)
+                             return null;
+
                          return GdmUtil.fadeInActor(this._sessionList.actor);
                      },
 
@@ -879,23 +894,18 @@ const LoginDialog = new Lang.Class({
     _showPrompt: function() {
         let hold = new Batch.Hold();
 
-        let buttons = [{ action: Lang.bind(this, this.cancel),
-                         label: _("Cancel"),
-                         key: Clutter.Escape },
-                       { action: Lang.bind(this, function() {
-                                     hold.release();
-                                 }),
-                         label: C_("button", "Sign In"),
-                         default: true }];
-
-        this._promptEntryActivateCallbackId = this._promptEntry.clutter_text.connect('activate',
-                                                                                     Lang.bind(this, function() {
-                                                                                         hold.release();
-                                                                                     }));
-        hold.connect('release', Lang.bind(this, function() {
-                         this._promptEntry.clutter_text.disconnect(this._promptEntryActivateCallbackId);
-                         this._promptEntryActivateCallbackId = null;
-                     }));
+        let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
+                                 label: _("Cancel"),
+                                 key: Clutter.Escape };
+        let okButtonInfo = { action: Lang.bind(this, function() {
+                                         hold.release();
+                                     }),
+                             label: C_("button", "Sign In"),
+                             default: true };
+        let buttons = [];
+        if (!this._disableUserList || this._verifyingUser)
+            buttons.push(cancelButtonInfo);
+        buttons.push(okButtonInfo);
 
         let tasks = [function() {
                          return this._fadeInPrompt();
@@ -913,11 +923,6 @@ const LoginDialog = new Lang.Class({
     },
 
     _hidePrompt: function() {
-        if (this._promptEntryActivateCallbackId) {
-            this._promptEntry.clutter_text.disconnect(this._promptEntryActivateCallbackId);
-            this._promptEntryActivateCallbackId = null;
-        }
-
         this.setButtons([]);
 
         let tasks = [function() {
@@ -953,6 +958,23 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
+    _askForUsernameAndLogIn: function() {
+        this._promptLabel.set_text(_("Username: "));
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char('');
+
+        let tasks = [this._showPrompt,
+
+                     function() {
+                         let userName = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         return this._beginVerificationForUser(userName);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
     _onSessionOpened: function(client, serviceName) {
         this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
     },
@@ -1081,11 +1103,7 @@ const LoginDialog = new Lang.Class({
                              }));
     },
 
-    _onVerificationFailed: function() {
-        this._userVerifier.cancel();
-    },
-
-    _onNotListedClicked: function(user) {
+    _hideUserListAndLogIn: function() {
         let tasks = [function() {
                          return this._userList.hideItems();
                      },
@@ -1103,10 +1121,7 @@ const LoginDialog = new Lang.Class({
                                                       this._fadeOutLogo]),
 
                      function() {
-                         let hold = new Batch.Hold();
-
-                         this._userVerifier.begin(null, hold);
-                         return hold;
+                         return this._askForUsernameAndLogIn();
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -1121,6 +1136,30 @@ const LoginDialog = new Lang.Class({
         return GdmUtil.fadeOutActor(this._logoBox);
     },
 
+    _showUserList: function() {
+        let tasks = [this._hidePrompt,
+
+                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
+                                                      this._fadeInNotListedButton,
+                                                      this._fadeInLogo]),
+
+                     function() {
+                         this._sessionList.close();
+                         this._promptLoginHint.hide();
+                         this._userList.actor.show();
+                         this._userList.actor.opacity = 255;
+                         return this._userList.showItems();
+                     },
+
+                     function() {
+                         this._userList.actor.reactive = true;
+                         this._userList.actor.grab_key_focus();
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        batch.run();
+    },
+
     _fadeInBanner: function() {
         return GdmUtil.fadeInActor(this._bannerLabel);
     },
@@ -1149,6 +1188,7 @@ const LoginDialog = new Lang.Class({
         let hold = new Batch.Hold();
 
         this._userVerifier.begin(userName, hold);
+        this._verifyingUser = true;
         return hold;
     },
 
@@ -1168,10 +1208,6 @@ const LoginDialog = new Lang.Class({
                          return this._userList.giveUpWhitespace();
                      },
 
-                     function() {
-                         return activatedItem.fadeOutName();
-                     },
-
                      new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
                                                       this._fadeOutNotListedButton,
                                                       this._fadeOutLogo]),
@@ -1206,6 +1242,8 @@ const LoginDialog = new Lang.Class({
             this._userList.addUser(users[i]);
         }
 
+        this._updateDisableUserList();
+
         this._userManager.connect('user-added',
                                   Lang.bind(this, function(userManager, user) {
                                       this._userList.addUser(user);
@@ -1227,9 +1265,9 @@ const LoginDialog = new Lang.Class({
     },
 
     _onOpened: function() {
-        Main.ctrlAltTabManager.addGroup(this._mainContentBox,
+        Main.ctrlAltTabManager.addGroup(this.dialogLayout,
                                         _("Login Window"),
-                                        'dialog-password',
+                                        'dialog-password-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
 
     },
@@ -1237,6 +1275,6 @@ const LoginDialog = new Lang.Class({
     close: function() {
         this.parent();
 
-        Main.ctrlAltTabManager.removeGroup(this._group);
+        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
     }
 });

js/gdm/powerMenu.js

@@ -31,7 +31,8 @@ const PowerMenuButton = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('system-shutdown-symbolic', null);
+        /* Translators: accessible name of the power menu in the login screen */
+        this.parent('system-shutdown-symbolic', _("Power"));
         this._upClient = new UPowerGlib.Client();
 
         this._loginManager = LoginManager.getLoginManager();

js/gdm/util.js

@@ -2,6 +2,7 @@
 
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
 const Batch = imports.gdm.batch;
@@ -19,8 +20,10 @@ const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
 const BANNER_MESSAGE_KEY = 'banner-message-enable';
 const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
+const ALLOWED_FAILURES_KEY = 'allowed-failures';
 
 const LOGO_KEY = 'logo';
+const DISABLE_USER_LIST_KEY = 'disable-user-list';
 
 function fadeInActor(actor) {
     if (actor.opacity == 255 && actor.visible)
@@ -81,6 +84,8 @@ const ShellUserVerifier = new Lang.Class({
 
         this._fprintManager = new Fprint.FprintManager();
         this._realmManager = new Realmd.Manager();
+
+        this._failCounter = 0;
     },
 
     begin: function(userName, hold) {
@@ -121,6 +126,9 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     answerQuery: function(serviceName, answer) {
+        // Clear any previous message
+        this.emit('show-message', null, null);
+
         this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
     },
 
@@ -137,34 +145,43 @@ const ShellUserVerifier = new Lang.Class({
             }));
     },
 
+    _reportInitError: function(where, error) {
+        logError(error, where);
+        this._hold.release();
+
+        this.emit('show-message', _("Authentication error"), 'login-dialog-message-warning');
+        this._verificationFailed(false);
+    },
+
     _reauthenticationChannelOpened: function(client, result) {
         try {
             this._userVerifier = client.open_reauthentication_channel_finish(result);
-            this._connectSignals();
-            this._beginVerification();
-
-            this._hold.release();
-        } catch (e) {
-            if (this._reauthOnly) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                    return;
-
-                logError(e, 'Failed to open reauthentication channel');
-                this.emit('verification-failed');
-                this._hold.release();
-                return;
-            }
-
-            // If there's no session running, or it otherwise fails, then fall back
-            // to performing verification from this login session
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+            return;
+        } catch(e if e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
+                !this._reauthOnly) {
+            // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there is
+            // no session to reauthenticate. Fall back to performing verification
+            // from this login session
             client.get_user_verifier(this._cancellable, Lang.bind(this, this._userVerifierGot));
+            return;
+        } catch(e) {
+            this._reportInitError('Failed to open reauthentication channel', e);
+            return;
         }
+
+        this._connectSignals();
+        this._beginVerification();
+        this._hold.release();
     },
 
     _userVerifierGot: function(client, result) {
         try {
             this._userVerifier = client.get_user_verifier_finish(result);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.ErrorEnum.CANCELLED)) {
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+            return;
+        } catch(e) {
+            this._reportInitError('Failed to obtain user verifier', e);
             return;
         }
 
@@ -195,6 +212,9 @@ const ShellUserVerifier = new Lang.Class({
                     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();
@@ -211,6 +231,9 @@ const ShellUserVerifier = new Lang.Class({
                         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();
@@ -224,6 +247,9 @@ const ShellUserVerifier = new Lang.Class({
                     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();
@@ -242,7 +268,7 @@ const ShellUserVerifier = new Lang.Class({
             // to indicate the user can swipe their finger instead
             this.emit('show-login-hint', _("(or swipe finger)"));
         } else if (serviceName == PASSWORD_SERVICE_NAME) {
-            Main.notifyError(info);
+            this.emit('show-message', info, 'login-dialog-message-info');
         }
     },
 
@@ -251,7 +277,7 @@ const ShellUserVerifier = new Lang.Class({
         // users who haven't enrolled their fingerprint.
         if (serviceName != PASSWORD_SERVICE_NAME)
             return;
-        Main.notifyError(problem);
+        this.emit('show-message', problem, 'login-dialog-message-warning');
     },
 
     _showRealmLoginHint: function() {
@@ -290,8 +316,10 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        this._userVerifier.run_dispose();
-        this._userVerifier = null;
+        this.clear();
+
+        // Clear previous attempts to authenticate
+        this._failCounter = 0;
 
         this.emit('reset');
     },
@@ -300,12 +328,37 @@ const ShellUserVerifier = new Lang.Class({
         this.emit('verification-complete');
     },
 
+    _verificationFailed: function(retry) {
+        // For Not Listed / enterprise logins, immediately reset
+        // the dialog
+        // Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
+        // go back to the welcome screen.
+
+        this._failCounter++;
+        let canRetry = retry && this._userName &&
+            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
+
+        if (canRetry) {
+            this.clear();
+            this.begin(this._userName, new Batch.Hold());
+        } else {
+            // Allow some time to see the message, then reset everything
+            Mainloop.timeout_add(3000, Lang.bind(this, function() {
+                this.cancel();
+
+                this._onReset();
+            }));
+        }
+
+        this.emit('verification-failed');
+    },
+
     _onConversationStopped: function(client, serviceName) {
         // if the password service fails, then cancel everything.
         // But if, e.g., fingerprint fails, still give
         // password authentication a chance to succeed
         if (serviceName == PASSWORD_SERVICE_NAME) {
-            this.emit('verification-failed');
+            this._verificationFailed(true);
         }
 
         this.emit('hide-login-hint');

js/misc/extensionUtils.js

@@ -120,11 +120,6 @@ function createExtensionObject(uuid, dir, type) {
         }
     }
 
-    // Encourage people to add this
-    if (!meta.url) {
-        log('Warning: Missing "url" property in %s/metadata.json'.format(uuid));
-    }
-
     if (uuid != meta.uuid) {
         throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
     }
@@ -161,7 +156,8 @@ const ExtensionFinder = new Lang.Class({
         try {
             fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
         } catch(e) {
-            logError(e, 'Could not enumerate extensions directory');
+            if (e.domain != Gio.io_error_quark() || e.code != Gio.IOErrorEnum.NOT_FOUND)
+                logError(e, 'Could not enumerate extensions directory');
             return;
         }
 

js/misc/history.js

@@ -41,24 +41,26 @@ const HistoryManager = new Lang.Class({
         this._historyIndex = this._history.length;
     },
 
-    prevItem: function(text) {
+    _setPrevItem: function(text) {
         if (this._historyIndex <= 0)
-            return text;
+            return false;
 
         if (text)
             this._history[this._historyIndex] = text;
         this._historyIndex--;
-        return this._indexChanged();
+        this._indexChanged();
+        return true;
     },
 
-    nextItem: function(text) {
+    _setNextItem: function(text) {
         if (this._historyIndex >= this._history.length)
-            return text;
+            return false;
 
         if (text)
             this._history[this._historyIndex] = text;
         this._historyIndex++;
-        return this._indexChanged();
+        this._indexChanged();
+        return true;
     },
 
     lastItem: function() {
@@ -83,11 +85,9 @@ const HistoryManager = new Lang.Class({
     _onEntryKeyPress: function(entry, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Up) {
-            this.prevItem(entry.get_text());
-            return true;
+            return this._setPrevItem(entry.get_text());
         } else if (symbol == Clutter.KEY_Down) {
-            this.nextItem(entry.get_text());
-            return true;
+            return this._setNextItem(entry.get_text());
         }
         return false;
     },
@@ -98,8 +98,6 @@ const HistoryManager = new Lang.Class({
 
         if (this._entry)
             this._entry.set_text(current);
-
-        return current;
     },
 
     _save: function() {

js/ui/boxpointer.js

@@ -141,6 +141,7 @@ const BoxPointer = new Lang.Class({
 
         this._muteInput();
 
+        Tweener.removeTweens(this);
         Tweener.addTween(this, { opacity: fade ? 0 : 255,
                                  xOffset: xOffset,
                                  yOffset: yOffset,
@@ -274,14 +275,51 @@ const BoxPointer = new Lang.Class({
         let [x1, y1] = [halfBorder, halfBorder];
         let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
 
+        let skipTopLeft = false;
+        let skipTopRight = false;
+        let skipBottomLeft = false;
+        let skipBottomRight = false;
+
+        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.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;
+        }
+
         cr.moveTo(x1 + borderRadius, y1);
         if (this._arrowSide == St.Side.TOP) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
+            if (skipTopLeft) {
+                cr.moveTo(x1, y2 - borderRadius);
+                cr.lineTo(x1, y1 - rise);
+                cr.lineTo(x1 + halfBase, y1);
+            } else if (skipTopRight) {
+                cr.lineTo(x2 - halfBase, y1);
+                cr.lineTo(x2, y1 - rise);
+                cr.lineTo(x2, y1 + borderRadius);
             } else {
                 cr.lineTo(this._arrowOrigin - halfBase, y1);
                 cr.lineTo(this._arrowOrigin, y1 - rise);
@@ -289,19 +327,20 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        cr.lineTo(x2 - borderRadius, y1);
-
-        // top-right corner
-        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-               3*Math.PI/2, Math.PI*2);
+        if (!skipTopRight) {
+            cr.lineTo(x2 - borderRadius, y1);
+            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+                   3*Math.PI/2, Math.PI*2);
+        }
 
         if (this._arrowSide == St.Side.RIGHT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
+            if (skipTopRight) {
+                cr.lineTo(x2 + rise, y1);
+                cr.lineTo(x2 + rise, y1 + halfBase);
+            } else if (skipBottomRight) {
+                cr.lineTo(x2, y2 - halfBase);
+                cr.lineTo(x2 + rise, y2);
+                cr.lineTo(x2 - borderRadius, y2);
             } else {
                 cr.lineTo(x2, this._arrowOrigin - halfBase);
                 cr.lineTo(x2 + rise, this._arrowOrigin);
@@ -309,19 +348,20 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        cr.lineTo(x2, y2 - borderRadius);
-
-        // bottom-right corner
-        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-               0, Math.PI/2);
+        if (!skipBottomRight) {
+            cr.lineTo(x2, y2 - borderRadius);
+            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+                   0, Math.PI/2);
+        }
 
         if (this._arrowSide == St.Side.BOTTOM) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
+            if (skipBottomLeft) {
+                cr.lineTo(x1 + halfBase, y2);
+                cr.lineTo(x1, y2 + rise);
+                cr.lineTo(x1, y2 - borderRadius);
+            } else if (skipBottomRight) {
+                cr.lineTo(x2, y2 + rise);
+                cr.lineTo(x2 - halfBase, y2);
             } else {
                 cr.lineTo(this._arrowOrigin + halfBase, y2);
                 cr.lineTo(this._arrowOrigin, y2 + rise);
@@ -329,19 +369,20 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        cr.lineTo(x1 + borderRadius, y2);
-
-        // bottom-left corner
-        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-               Math.PI/2, Math.PI);
+        if (!skipBottomLeft) {
+            cr.lineTo(x1 + borderRadius, y2);
+            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+                   Math.PI/2, Math.PI);
+        }
 
         if (this._arrowSide == St.Side.LEFT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+            if (skipTopLeft) {
+                cr.lineTo(x1, y1 + halfBase);
+                cr.lineTo(x1 - rise, y1);
+                cr.lineTo(x1 + borderRadius, y1);
+            } else if (skipBottomLeft) {
+                cr.lineTo(x1 - rise, y2)
+                cr.lineTo(x1 - rise, y2 - halfBase);
             } else {
                 cr.lineTo(x1, this._arrowOrigin + halfBase);
                 cr.lineTo(x1 - rise, this._arrowOrigin);
@@ -349,11 +390,11 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        cr.lineTo(x1, y1 + borderRadius);
-
-        // top-left corner
-        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-               Math.PI, 3*Math.PI/2);
+        if (!skipTopLeft) {
+            cr.lineTo(x1, y1 + borderRadius);
+            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+                   Math.PI, 3*Math.PI/2);
+        }
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
         cr.fillPreserve();
@@ -406,9 +447,7 @@ const BoxPointer = new Lang.Class({
         let arrowBase = themeNode.get_length('-arrow-base');
         let borderRadius = themeNode.get_length('-arrow-border-radius');
         let margin = (4 * borderRadius + borderWidth + arrowBase);
-        let halfMargin = margin / 2;
 
-        let themeNode = this.actor.get_theme_node();
         let gap = themeNode.get_length('-boxpointer-gap');
         let padding = themeNode.get_length('-arrow-rise');
 
@@ -429,8 +468,24 @@ const BoxPointer = new Lang.Class({
             break;
         }
 
-        // Now align and position the pointing axis, making sure
-        // it fits on screen
+        // Now align and position the pointing axis, making sure it fits on
+        // screen. If the arrowOrigin is so close to the edge that the arrow
+        // will not be isosceles, we try to compensate as follows:
+        //   - We skip the rounded corner and settle for a right angled arrow
+        //     as shown below. See _drawBorder for further details.
+        //     |\_____
+        //     |
+        //     |
+        //   - If the arrow was going to be acute angled, we move the position
+        //     of the box to maintain the arrow's accuracy.
+
+        let arrowOrigin;
+        let halfBase = Math.floor(arrowBase/2);
+        let halfBorder = borderWidth / 2;
+        let halfMargin = margin / 2;
+        let [x1, y1] = [halfBorder, halfBorder];
+        let [x2, y2] = [natWidth - halfBorder, natHeight - halfBorder];
+
         switch (this._arrowSide) {
         case St.Side.TOP:
         case St.Side.BOTTOM:
@@ -438,7 +493,17 @@ const BoxPointer = new Lang.Class({
 
             resX = Math.max(resX, monitor.x + padding);
             resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
-            this.setArrowOrigin(sourceCenterX - resX);
+
+            arrowOrigin = sourceCenterX - resX;
+            if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
+                if (arrowOrigin > x1)
+                    resX += (arrowOrigin - x1);
+                arrowOrigin = x1;
+            } else if (arrowOrigin >= (x2 - (borderRadius + halfBase))) {
+                if (arrowOrigin < x2)
+                    resX -= (x2 - arrowOrigin);
+                arrowOrigin = x2;
+            }
             break;
 
         case St.Side.LEFT:
@@ -448,10 +513,21 @@ const BoxPointer = new Lang.Class({
             resY = Math.max(resY, monitor.y + padding);
             resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
 
-            this.setArrowOrigin(sourceCenterY - resY);
+            arrowOrigin = sourceCenterY - resY;
+            if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
+                if (arrowOrigin > y1)
+                    resY += (arrowOrigin - y1);
+                arrowOrigin = y1;
+            } else if (arrowOrigin >= (y2 - (borderRadius + halfBase))) {
+                if (arrowOrigin < y2)
+                    resX -= (y2 - arrowOrigin);
+                arrowOrigin = y2;
+            }
             break;
         }
 
+        this.setArrowOrigin(arrowOrigin);
+
         let parent = this.actor.get_parent();
         let success, x, y;
         while (!success) {

js/ui/calendar.js

@@ -339,22 +339,10 @@ const DBusEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(DBusEventSource.prototype);
 
-// Calendar:
-// @eventSource: is an object implementing the EventSource API, e.g. the
-// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
 const Calendar = new Lang.Class({
     Name: 'Calendar',
 
-    _init: function(eventSource) {
-        if (eventSource) {
-            this._eventSource = eventSource;
-
-            this._eventSource.connect('changed', Lang.bind(this,
-                                                           function() {
-                                                               this._update(false);
-                                                           }));
-        }
-
+    _init: function() {
         this._weekStart = Shell.util_get_week_start();
         this._weekdate = NaN;
         this._digitWidth = NaN;
@@ -391,6 +379,24 @@ const Calendar = new Lang.Class({
         this._buildHeader ();
     },
 
+    // @eventSource: is an object implementing the EventSource API, e.g. the
+    // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
+    setEventSource: function(eventSource) {
+        if (this._eventSource) {
+            this._eventSource.disconnect(this._eventSourceChangedId);
+            this._eventSource = null;
+        }
+
+        this._eventSource = eventSource;
+
+        if (this._eventSource) {
+            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, function() {
+                this._update(false);
+            }));
+            this._update(true);
+        }
+    },
+
     // Sets the calendar to show a specific date
     setDate: function(date, forceReload) {
         if (!_sameDay(date, this._selectedDate)) {
@@ -621,16 +627,25 @@ Signals.addSignalMethods(Calendar.prototype);
 const EventsList = new Lang.Class({
     Name: 'EventsList',
 
-    _init: function(eventSource) {
+    _init: function() {
         this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
         this._date = new Date();
-        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, this._update));
         this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
         this._weekStart = Shell.util_get_week_start();
+    },
 
-        this._update();
+    setEventSource: function(eventSource) {
+        if (this._eventSource) {
+            this._eventSource.disconnect(this._eventSourceChangedId);
+            this._eventSource = null;
+        }
+
+        this._eventSource = eventSource;
+
+        if (this._eventSource) {
+            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, this._update));
+        }
     },
 
     _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {

js/ui/components/__init__.js

@@ -0,0 +1,65 @@
+
+const Lang = imports.lang;
+const Main = imports.ui.main;
+
+const ComponentManager = new Lang.Class({
+    Name: 'ComponentManager',
+
+    _init: function() {
+        this._allComponents = {};
+        this._enabledComponents = [];
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
+    },
+
+    _sessionUpdated: function() {
+        let newEnabledComponents = Main.sessionMode.components;
+
+        newEnabledComponents.filter(Lang.bind(this, function(name) {
+            return this._enabledComponents.indexOf(name) == -1;
+        })).forEach(Lang.bind(this, function(name) {
+            this._enableComponent(name);
+        }));
+
+        this._enabledComponents.filter(Lang.bind(this, function(name) {
+            return newEnabledComponents.indexOf(name) == -1;
+        })).forEach(Lang.bind(this, function(name) {
+            this._disableComponent(name);
+        }));
+
+        this._enabledComponents = newEnabledComponents;
+    },
+
+    _importComponent: function(name) {
+        let module = imports.ui.components[name];
+        return module.Component;
+    },
+
+    _ensureComponent: function(name) {
+        let component = this._allComponents[name];
+        if (component)
+            return component;
+
+	if (Main.sessionMode.isLocked)
+	    return null;
+
+        let constructor = this._importComponent(name);
+        component = new constructor();
+        this._allComponents[name] = component;
+        return component;
+    },
+
+    _enableComponent: function(name) {
+        let component = this._ensureComponent(name);
+	if (component)
+            component.enable();
+    },
+
+    _disableComponent: function(name) {
+        let component = this._allComponents[name];
+        if (component == null)
+            return;
+        component.disable();
+    }
+});

js/ui/components/automountManager.js

@@ -34,28 +34,30 @@ const AutomountManager = new Lang.Class({
         this._inhibited = false;
 
         this._loginManager = LoginManager.getLoginManager();
-
-        Main.screenShield.connect('lock-status-changed', Lang.bind(this, this._lockStatusChanged));
-
         this._volumeMonitor = Gio.VolumeMonitor.get();
+    },
 
-        this._volumeMonitor.connect('volume-added',
-                                    Lang.bind(this,
-                                              this._onVolumeAdded));
-        this._volumeMonitor.connect('volume-removed',
-                                    Lang.bind(this,
-                                              this._onVolumeRemoved));
-        this._volumeMonitor.connect('drive-connected',
-                                    Lang.bind(this,
-                                              this._onDriveConnected));
-        this._volumeMonitor.connect('drive-disconnected',
-                                    Lang.bind(this,
-                                              this._onDriveDisconnected));
-        this._volumeMonitor.connect('drive-eject-button',
-                                    Lang.bind(this,
-                                              this._onDriveEjectButton));
+    enable: function() {
+        this._volumeAddedId = this._volumeMonitor.connect('volume-added', Lang.bind(this, this._onVolumeAdded));
+        this._volumeRemovedId = this._volumeMonitor.connect('volume-removed', Lang.bind(this, this._onVolumeRemoved));
+        this._driveConnectedId = this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._onDriveConnected));
+        this._driveDisconnectedId = this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._onDriveDisconnected));
+        this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', Lang.bind(this, this._onDriveEjectButton));
 
-        Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
+        this._mountAllId = Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
+    },
+
+    disable: function() {
+        this._volumeMonitor.disconnect(this._volumeAddedId);
+        this._volumeMonitor.disconnect(this._volumeRemovedId);
+        this._volumeMonitor.disconnect(this._driveConnectedId);
+        this._volumeMonitor.disconnect(this._driveDisconnectedId);
+        this._volumeMonitor.disconnect(this._driveEjectButtonId);
+
+        if (this._mountAllId > 0) {
+            Mainloop.source_remove(this._mountAllId);
+            this._mountAllId = 0;
+        }
     },
 
     _InhibitorsChanged: function(object, senderName, [inhibtor]) {
@@ -68,17 +70,6 @@ const AutomountManager = new Lang.Class({
                 }));
     },
 
-    _lockStatusChanged: function(shield, locked) {
-        if (!locked) {
-            this._volumeQueue.forEach(Lang.bind(this, function(volume) {
-                this._checkAndMountVolume(volume);
-            }));
-        }
-
-        // clear the queue anyway
-        this._volumeQueue = [];
-    },
-
     _startupMountAll: function() {
         let volumes = this._volumeMonitor.get_volumes();
         volumes.forEach(Lang.bind(this, function(volume) {
@@ -87,6 +78,7 @@ const AutomountManager = new Lang.Class({
                                                 allowAutorun: false });
         }));
 
+        this._mountAllId = 0;
         return false;
     },
 
@@ -96,9 +88,6 @@ const AutomountManager = new Lang.Class({
         if (!this._loginManager.sessionActive)
             return;
 
-        if (Main.screenShield.locked)
-            return;
-
         global.play_theme_sound(0, 'device-added-media');
     },
 
@@ -108,9 +97,6 @@ const AutomountManager = new Lang.Class({
         if (!this._loginManager.sessionActive)
             return;
 
-        if (Main.screenShield.locked)
-            return;
-
         global.play_theme_sound(0, 'device-removed-media');        
     },
 
@@ -159,13 +145,6 @@ const AutomountManager = new Lang.Class({
             // don't attempt automount
             if (!this._loginManager.sessionActive)
                 return;
-
-            if (Main.screenShield.locked) {
-                if (this._volumeQueue.indexOf(volume) == -1)
-                    this._volumeQueue.push(volume);
-
-                return;
-            }
         }
 
         if (this._inhibited)
@@ -259,3 +238,4 @@ const AutomountManager = new Lang.Class({
         });
     }
 });
+const Component = AutomountManager;

js/ui/components/autorunManager.js

@@ -44,6 +44,19 @@ function isMountRootHidden(root) {
     return (path.indexOf('/.') != -1);
 }
 
+function isMountNonLocal(mount) {
+    // If the mount doesn't have an associated volume, that means it could
+    // be a remote filesystem. For certain kinds of local filesystems,
+    // like digital cameras and music players, there's no associated
+    // gvfs volume, so err on the side of caution and assume it's a local
+    // filesystem to allow the prompt.
+    let volume = mount.get_volume();
+    if (volume == null)
+        return false;
+
+    return (volume.get_identifier("class") == "network");
+}
+
 function startAppForMount(app, mount) {
     let files = [];
     let root = mount.get_root();
@@ -83,13 +96,21 @@ const ContentTypeDiscoverer = new Lang.Class({
 
     _init: function(callback) {
         this._callback = callback;
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
 
     guessContentTypes: function(mount) {
-        // guess mount's content types using GIO
-        mount.guess_content_type(false, null,
-                                 Lang.bind(this,
-                                           this._onContentTypeGuessed));
+        let autorunEnabled = !this._settings.get_boolean(SETTING_DISABLE_AUTORUN);
+        let shouldScan = autorunEnabled && !isMountNonLocal(mount);
+
+        if (shouldScan) {
+            // guess mount's content types using GIO
+            mount.guess_content_type(false, null,
+                                     Lang.bind(this,
+                                               this._onContentTypeGuessed));
+        } else {
+            this._emitCallback(mount, []);
+        }
     },
 
     _onContentTypeGuessed: function(mount, res) {
@@ -147,33 +168,50 @@ const AutorunManager = new Lang.Class({
 
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
-        this._volumeMonitor.connect('mount-added',
-                                    Lang.bind(this,
-                                              this._onMountAdded));
-        this._volumeMonitor.connect('mount-removed',
-                                    Lang.bind(this,
-                                              this._onMountRemoved));
+        this._transDispatcher = new AutorunTransientDispatcher(this);
+    },
 
-        this._transDispatcher = new AutorunTransientDispatcher();
-        this._createResidentSource();
+    _ensureResidentSource: function() {
+        if (this._residentSource)
+            return;
 
-        let mounts = this._volumeMonitor.get_mounts();
-
-        mounts.forEach(Lang.bind(this, function (mount) {
-            let discoverer = new ContentTypeDiscoverer(Lang.bind (this, 
-                function (mount, apps) {
-                    this._residentSource.addMount(mount, apps);
-                }));
-
-            discoverer.guessContentTypes(mount);
+        this._residentSource = new AutorunResidentSource(this);
+        let destroyId = this._residentSource.connect('destroy', Lang.bind(this, function() {
+            this._residentSource.disconnect(destroyId);
+            this._residentSource = null;
         }));
     },
 
-    _createResidentSource: function() {
-        this._residentSource = new AutorunResidentSource();
-        this._residentSource.connect('destroy',
-                                     Lang.bind(this,
-                                               this._createResidentSource));
+    enable: function() {
+        this._scanMounts();
+
+        this._mountAddedId = this._volumeMonitor.connect('mount-added', Lang.bind(this, this._onMountAdded));
+        this._mountRemovedId = this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._onMountRemoved));
+    },
+
+    disable: function() {
+        if (this._residentSource)
+            this._residentSource.destroy();
+        this._volumeMonitor.disconnect(this._mountAddedId);
+        this._volumeMonitor.disconnect(this._mountRemovedId);
+    },
+
+    _processMount: function(mount, hotplug) {
+        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
+            this._ensureResidentSource();
+            this._residentSource.addMount(mount, apps);
+
+            if (hotplug)
+                this._transDispatcher.addMount(mount, apps, contentTypes);
+        }));
+        discoverer.guessContentTypes(mount);
+    },
+
+    _scanMounts: function() {
+        let mounts = this._volumeMonitor.get_mounts();
+        mounts.forEach(Lang.bind(this, function(mount) {
+            this._processMount(mount, false);
+        }));
     },
 
     _onMountAdded: function(monitor, mount) {
@@ -182,18 +220,13 @@ const AutorunManager = new Lang.Class({
         if (!this._loginManager.sessionActive)
             return;
 
-        let discoverer = new ContentTypeDiscoverer(Lang.bind (this,
-            function (mount, apps, contentTypes) {
-                this._transDispatcher.addMount(mount, apps, contentTypes);
-                this._residentSource.addMount(mount, apps);
-            }));
-
-        discoverer.guessContentTypes(mount);
+        this._processMount(mount, true);
     },
 
     _onMountRemoved: function(monitor, mount) {
         this._transDispatcher.removeMount(mount);
-        this._residentSource.removeMount(mount);
+        if (this._residentSource)
+            this._residentSource.removeMount(mount);
     },
 
     ejectMount: function(mount) {
@@ -260,13 +293,18 @@ const AutorunResidentSource = new Lang.Class({
     Name: 'AutorunResidentSource',
     Extends: MessageTray.Source,
 
-    _init: function() {
+    _init: function(manager) {
         this.parent(_("Removable Devices"), 'media-removable');
         this.showInLockScreen = false;
 
         this._mounts = [];
 
-        this._notification = new AutorunResidentNotification(this);
+        this._manager = manager;
+        this._notification = new AutorunResidentNotification(this._manager, this);
+    },
+
+    buildRightClickMenu: function() {
+        return null;
     },
 
     addMount: function(mount, apps) {
@@ -316,7 +354,7 @@ const AutorunResidentNotification = new Lang.Class({
     Name: 'AutorunResidentNotification',
     Extends: MessageTray.Notification,
 
-    _init: function(source) {
+    _init: function(manager, source) {
         this.parent(source, source.title, null, { customContent: true });
 
         // set the notification as resident
@@ -324,6 +362,7 @@ const AutorunResidentNotification = new Lang.Class({
 
         this._layout = new St.BoxLayout ({ style_class: 'hotplug-resident-box',
                                            vertical: true });
+        this._manager = manager;
 
         this.addActor(this._layout,
                       { x_expand: true,
@@ -371,7 +410,7 @@ const AutorunResidentNotification = new Lang.Class({
                                 expand: true });
 
         let ejectIcon = 
-            new St.Icon({ icon_name: 'media-eject',
+            new St.Icon({ icon_name: 'media-eject-symbolic',
                           style_class: 'hotplug-resident-eject-icon' });
 
         let ejectButton =
@@ -386,7 +425,7 @@ const AutorunResidentNotification = new Lang.Class({
         }));
 
         ejectButton.connect('clicked', Lang.bind(this, function() {
-            Main.autorunManager.ejectMount(mount);
+            this._manager.ejectMount(mount);
         }));
 
         return item;
@@ -396,7 +435,8 @@ const AutorunResidentNotification = new Lang.Class({
 const AutorunTransientDispatcher = new Lang.Class({
     Name: 'AutorunTransientDispatcher',
 
-    _init: function() {
+    _init: function(manager) {
+        this._manager = manager;
         this._sources = [];
         this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
@@ -439,7 +479,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             return;
      
         // add a new source
-        this._sources.push(new AutorunTransientSource(mount, apps));
+        this._sources.push(new AutorunTransientSource(this._manager, mount, apps));
     },
 
     addMount: function(mount, apps, contentTypes) {
@@ -492,13 +532,14 @@ const AutorunTransientSource = new Lang.Class({
     Name: 'AutorunTransientSource',
     Extends: MessageTray.Source,
 
-    _init: function(mount, apps) {
+    _init: function(manager, mount, apps) {
+        this._manager = manager;
         this.mount = mount;
         this.apps = apps;
 
         this.parent(mount.get_name());
 
-        this._notification = new AutorunTransientNotification(this);
+        this._notification = new AutorunTransientNotification(this._manager, this);
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
@@ -515,9 +556,10 @@ const AutorunTransientNotification = new Lang.Class({
     Name: 'AutorunTransientNotification',
     Extends: MessageTray.Notification,
 
-    _init: function(source) {
+    _init: function(manager, source) {
         this.parent(source, source.title, null, { customContent: true });
 
+        this._manager = manager;
         this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
                                        vertical: true });
         this.addActor(this._box);
@@ -569,7 +611,7 @@ const AutorunTransientNotification = new Lang.Class({
 
     _buttonForEject: function() {
         let box = new St.BoxLayout();
-        let icon = new St.Icon({ icon_name: 'media-eject',
+        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
                                  style_class: 'hotplug-notification-item-icon' });
         box.add(icon);
 
@@ -586,10 +628,11 @@ const AutorunTransientNotification = new Lang.Class({
                                      style_class: 'hotplug-notification-item' });
 
         button.connect('clicked', Lang.bind(this, function() {
-            Main.autorunManager.ejectMount(this._mount);
+            this._manager.ejectMount(this._mount);
         }));
 
         return button;
     }
 });
 
+const Component = AutorunManager;

js/ui/components/keyring.js

@@ -192,23 +192,36 @@ const KeyringDialog = new Lang.Class({
     },
 
     _onContinueButton: function() {
-        this.prompt.complete()
+        this.prompt.complete();
     },
 
     _onCancelButton: function() {
-        this.prompt.cancel()
+        this.prompt.cancel();
     },
 });
 
-function init() {
-    prompter = new Gcr.SystemPrompter();
-    prompter.connect('new-prompt', function(prompter) {
-        let dialog = new KeyringDialog();
-        return dialog.prompt;
-    });
+const KeyringPrompter = new Lang.Class({
+    Name: 'KeyringPrompter',
 
-    let connection = Gio.DBus.session;
-    prompter.register(connection);
-    Gio.bus_own_name_on_connection (connection, 'org.gnome.keyring.SystemPrompter',
-                                    Gio.BusNameOwnerFlags.REPLACE, null, null);
-}
+    _init: function() {
+        this._prompter = new Gcr.SystemPrompter();
+        this._prompter.connect('new-prompt', function(prompter) {
+            let dialog = new KeyringDialog();
+            return dialog.prompt;
+        });
+        this._dbusId = null;
+    },
+
+    enable: function() {
+        this._prompter.register(Gio.DBus.session);
+        this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
+                                                 Gio.BusNameOwnerFlags.REPLACE, null, null);
+    },
+
+    disable: function() {
+        this._prompter.unregister(false);
+        Gio.DBus.session.unown_name(this._dbusId);
+    }
+});
+
+const Component = KeyringPrompter;

js/ui/components/networkAgent.js

@@ -1,23 +1,4 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/*
- * Copyright 2011 Giovanni Campagna <scampa.giovanni@gmail.com>
- *
- * 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 Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
@@ -427,7 +408,10 @@ const VPNRequestHandler = new Lang.Class({
         }
     },
 
-    cancel: function() {
+    cancel: function(respond) {
+        if (respond)
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
+
         if (this._newStylePlugin && this._shellDialog) {
             this._shellDialog.close(global.get_current_time());
             this._shellDialog.destroy();
@@ -603,7 +587,7 @@ const NetworkAgent = new Lang.Class({
     Name: 'NetworkAgent',
 
     _init: function() {
-        this._native = new Shell.NetworkAgent({ auto_register: true,
+        this._native = new Shell.NetworkAgent({ auto_register: false,
                                                 identifier: 'org.gnome.Shell.NetworkAgent' });
 
         this._dialogs = { };
@@ -613,6 +597,24 @@ const NetworkAgent = new Lang.Class({
         this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
     },
 
+    enable: function() {
+        this._native.register();
+    },
+
+    disable: function() {
+        let requestId;
+
+        for (requestId in this._dialogs)
+            this._dialogs[requestId].cancel();
+        this._dialogs = { };
+
+        for (requestId in this._vpnRequests)
+            this._vpnRequests[requestId].cancel(true);
+        this._vpnRequests = { };
+
+        this._native.unregister();
+    },
+
     _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {
         if (settingName == 'vpn') {
             this._vpnRequest(requestId, connection, hints, flags);
@@ -633,7 +635,7 @@ const NetworkAgent = new Lang.Class({
             this._dialogs[requestId].destroy();
             delete this._dialogs[requestId];
         } else if (this._vpnRequests[requestId]) {
-            this._vpnRequests[requestId].cancel();
+            this._vpnRequests[requestId].cancel(false);
             delete this._vpnRequests[requestId];
         }
     },
@@ -702,3 +704,4 @@ const NetworkAgent = new Lang.Class({
         }
     }
 });
+const Component = NetworkAgent;

js/ui/components/polkitAgent.js

@@ -1,24 +1,4 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/*
- * Copyright 2010 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.
-*
- * Author: David Zeuthen <davidz@redhat.com>
- */
 
 const Lang = imports.lang;
 const Signals = imports.signals;
@@ -33,6 +13,7 @@ const Mainloop = imports.mainloop;
 const Polkit = imports.gi.Polkit;
 const PolkitAgent = imports.gi.PolkitAgent;
 
+const Components = imports.ui.components;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const UserMenu = imports.ui.userMenu;
@@ -68,7 +49,7 @@ const AuthenticationDialog = new Lang.Class({
         let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
                                             vertical: true });
         mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
+                           { expand: true, y_align: St.Align.START });
 
         this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                             text: _("Authentication Required") });
@@ -318,7 +299,7 @@ const AuthenticationDialog = new Lang.Class({
     },
 
     _onUserChanged: function() {
-        if (this._user.is_loaded) {
+        if (this._user.is_loaded && this._userAvatar) {
             this._userAvatar.update();
             this._userAvatar.actor.show();
         }
@@ -336,11 +317,20 @@ const AuthenticationAgent = new Lang.Class({
     Name: 'AuthenticationAgent',
 
     _init: function() {
+        this._currentDialog = null;
+        this._isCompleting = false;
+        this._handle = null;
         this._native = new Shell.PolkitAuthenticationAgent();
         this._native.connect('initiate', Lang.bind(this, this._onInitiate));
         this._native.connect('cancel', Lang.bind(this, this._onCancel));
-        this._currentDialog = null;
-        this._isCompleting = false;
+    },
+
+    enable: function() {
+        this._native.register();
+    },
+
+    disable: function() {
+        this._native.unregister();
     },
 
     _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
@@ -398,6 +388,4 @@ const AuthenticationAgent = new Lang.Class({
     }
 });
 
-function init() {
-    let agent = new AuthenticationAgent();
-}
+const Component = AuthenticationAgent;

js/ui/components/recorder.js

@@ -0,0 +1,58 @@
+
+const Lang = imports.lang;
+
+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() {
+        global.display.add_keybinding('toggle-recording',
+                                      this._bindingSettings,
+                                      Meta.KeyBindingFlags.NONE, Lang.bind(this, this._toggleRecorder));
+    },
+
+    disable: function() {
+        global.display.remove_keybinding('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_filename(_("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

@@ -11,10 +11,10 @@ const Tpl = imports.gi.TelepathyLogger;
 const Tp = imports.gi.TelepathyGLib;
 
 const History = imports.misc.history;
-const Params = imports.misc.params;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-
+const Params = imports.misc.params;
+const PopupMenu = imports.ui.popupMenu;
 
 // See Notification.appendMessage
 const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
@@ -63,10 +63,10 @@ function makeMessageFromTplEvent(event) {
     };
 }
 
-const Client = new Lang.Class({
-    Name: 'Client',
+const TelepathyClient = new Lang.Class({
+    Name: 'TelepathyClient',
 
-    _init : function() {
+    _init: function() {
         // channel path -> ChatSource
         this._chatSources = {};
         this._chatState = Tp.ChannelChatState.ACTIVE;
@@ -89,9 +89,9 @@ const Client = new Lang.Class({
         // channel matching its filters is detected.
         // The second argument, recover, means _observeChannels will be run
         // for any existing channel as well.
-        this._tpClient = new Shell.TpClient({ 'account-manager': this._accountManager,
-                                              'name': 'GnomeShell',
-                                              'uniquify-name': true })
+        this._tpClient = new Shell.TpClient({ name: 'GnomeShell',
+                                              account_manager: this._accountManager,
+                                              uniquify_name: true });
         this._tpClient.set_observe_channels_func(
             Lang.bind(this, this._observeChannels));
         this._tpClient.set_approve_channels_func(
@@ -99,6 +99,10 @@ const Client = new Lang.Class({
         this._tpClient.set_handle_channels_func(
             Lang.bind(this, this._handleChannels));
 
+        // Watch subscription requests and connection errors
+        this._subscriptionSource = null;
+        this._accountSource = null;
+
         // Workaround for gjs not supporting GPtrArray in signals.
         // See BGO bug #653941 for context.
         this._tpClient.set_contact_list_changed_func(
@@ -108,21 +112,26 @@ const Client = new Lang.Class({
         // needed
         this._tpClient.set_delegated_channels_callback(
             Lang.bind(this, this._delegatedChannelsCb));
+    },
 
+    enable: function() {
         try {
             this._tpClient.register();
         } catch (e) {
             throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
         }
 
-        // Watch subscription requests and connection errors
-        this._subscriptionSource = null;
-        this._accountSource = null;
+        this._accountManagerValidityChangedId = this._accountManager.connect('account-validity-changed',
+                                                                             Lang.bind(this, this._accountValidityChanged));
 
-        this._accountManager.connect('account-validity-changed',
-            Lang.bind(this, this._accountValidityChanged));
+        if (!this._accountManager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
+            this._accountManager.prepare_async(null, Lang.bind(this, this._accountManagerPrepared));
+    },
 
-        this._accountManager.prepare_async(null, Lang.bind(this, this._accountManagerPrepared));
+    disable: function() {
+        this._tpClient.unregister();
+        this._accountManager.disconnect(this._accountManagerValidityChangedId);
+        this._accountManagerValidityChangedId = 0;
     },
 
     _observeChannels: function(observer, account, conn, channels,
@@ -473,6 +482,22 @@ const ChatSource = new Lang.Class({
         this._getLogMessages();
     },
 
+    buildRightClickMenu: function() {
+        let item;
+
+        let rightClickMenu = this.parent();
+        item = new PopupMenu.PopupMenuItem('');
+        item.actor.connect('notify::mapped', Lang.bind(this, function() {
+            item.label.set_text(this.isMuted ? _("Unmute") : _("Mute"));
+        }));
+        item.connect('activate', Lang.bind(this, function() {
+            this.setMuted(!this.isMuted);
+            this.emit('done-displaying-content');
+        }));
+        rightClickMenu.add(item.actor);
+        return rightClickMenu;
+    },
+
     _updateAlias: function() {
         let oldAlias = this.title;
         let newAlias = this._contact.get_alias();
@@ -539,7 +564,9 @@ const ChatSource = new Lang.Class({
     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(), '', null);
+              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
@@ -721,8 +748,6 @@ const ChatSource = new Lang.Class({
             this._pendingMessages.splice(idx, 1);
             this.countUpdated();
         }
-        else
-            throw new Error('Message not in our pending list: ' + message);
     },
 
     _ackMessages: function() {
@@ -747,16 +772,26 @@ const ChatNotification = new Lang.Class({
         this._responseEntry.clutter_text.connect('text-changed', Lang.bind(this, this._onEntryChanged));
         this.setActionArea(this._responseEntry);
 
-        this._oldMaxScrollAdjustment = 0;
+        this._responseEntry.clutter_text.connect('key-focus-in', Lang.bind(this, function() {
+            this.focused = true;
+        }));
+        this._responseEntry.clutter_text.connect('key-focus-out', Lang.bind(this, function() {
+            this.focused = false;
+            this.emit('unfocused');
+        }));
+
         this._createScrollArea();
         this._lastGroup = null;
         this._lastGroupActor = null;
 
+        // Keep track of the bottom position for the current adjustment and
+        // force a scroll to the bottom if things change while we were at the
+        // bottom
+        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
         this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
+            if (adjustment.value == this._oldMaxScrollValue)
                 this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
+            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
         }));
 
         this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
@@ -1399,3 +1434,4 @@ const AccountNotification = new Lang.Class({
         this.parent();
     }
 });
+const Component = TelepathyClient;

js/ui/ctrlAltTab.js

@@ -54,16 +54,17 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     focusGroup: function(item) {
-        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
-            global.stage_input_mode == Shell.StageInputMode.NORMAL)
-            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-
-        if (item.window)
+        if (item.window) {
             Main.activateWindow(item.window);
-        else if (item.focusCallback)
+        } else if (item.focusCallback) {
             item.focusCallback();
-        else
+        } else {
+            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+                global.stage_input_mode == Shell.StageInputMode.NORMAL)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     // Sort the items into a consistent order; panel first, tray last,

js/ui/dash.js

@@ -21,6 +21,18 @@ const DASH_ITEM_LABEL_SHOW_TIME = 0.15;
 const DASH_ITEM_LABEL_HIDE_TIME = 0.1;
 const DASH_ITEM_HOVER_TIMEOUT = 300;
 
+function getAppFromSource(source) {
+    if (source instanceof AppDisplay.AppWellIcon) {
+        let appSystem = Shell.AppSystem.get_default();
+        return appSystem.lookup_app(source.getId());
+    } else if (source.metaWindow) {
+        let tracker = Shell.WindowTracker.get_default();
+        return tracker.get_window_app(source.metaWindow);
+    } else {
+        return null;
+    }
+}
+
 // A container like StBin, but taking the child's scale into account
 // when requesting a size
 const DashItemContainer = new Lang.Class({
@@ -36,7 +48,11 @@ const DashItemContainer = new Lang.Class({
                            Lang.bind(this, this._allocate));
         this.actor._delegate = this;
 
-        this.label = null;
+        this._labelText = "";
+        this.label = new St.Label({ style_class: 'dash-label'});
+        this.label.hide();
+        Main.layoutManager.addChrome(this.label);
+        this.actor.label_actor = this.label;
 
         this.child = null;
         this._childScale = 1;
@@ -91,9 +107,10 @@ const DashItemContainer = new Lang.Class({
     },
 
     showLabel: function() {
-        if (this.label == null)
+        if (!this._labelText)
             return;
 
+        this.label.set_text(this._labelText);
         this.label.opacity = 0;
         this.label.show();
 
@@ -124,19 +141,11 @@ const DashItemContainer = new Lang.Class({
     },
 
     setLabelText: function(text) {
-        if (this.label == null) {
-            this.label = new St.Label({ style_class: 'dash-label'});
-            Main.layoutManager.addChrome(this.label);
-            this.label.hide();
-        }
-
-        this.label.set_text(text);
+        this._labelText = text;
+        this.child.accessible_name = text;
     },
 
     hideLabel: function () {
-        if (this.label == null)
-            return;
-
         Tweener.addTween(this.label,
                          { opacity: 0,
                            time: DASH_ITEM_LABEL_HIDE_TIME,
@@ -250,8 +259,7 @@ const ShowAppsIcon = new Lang.Class({
         this.toggleButton._delegate = this;
 
         this.setChild(this.toggleButton);
-        this.setHover(false);
-        this.toggleButton.label_actor = this.label;
+        this.setDragApp(null);
     },
 
     _createIcon: function(size) {
@@ -262,31 +270,45 @@ const ShowAppsIcon = new Lang.Class({
         return this._iconActor;
     },
 
-    setHover: function(hovered) {
-        this.toggleButton.set_hover(hovered);
-        if (this._iconActor)
-            this._iconActor.set_hover(hovered);
+    _canRemoveApp: function(app) {
+        if (app == null)
+            return false;
 
-        if (hovered)
+        let id = app.get_id();
+        let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
+        return isFavorite;
+    },
+
+    setDragApp: function(app) {
+        let canRemove = this._canRemoveApp(app);
+
+        this.toggleButton.set_hover(canRemove);
+        if (this._iconActor)
+            this._iconActor.set_hover(canRemove);
+
+        if (canRemove)
             this.setLabelText(_("Remove from Favorites"));
         else
             this.setLabelText(_("Show Applications"));
     },
 
-    // Rely on the dragged item being a favorite
     handleDragOver: function(source, actor, x, y, time) {
+        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;
     },
 
     acceptDrop: function(source, actor, x, y, time) {
-        let app = null;
-        if (source instanceof AppDisplay.AppWellIcon) {
-            let appSystem = Shell.AppSystem.get_default();
-            app = appSystem.lookup_app(source.getId());
-        } else if (source.metaWindow) {
-            let tracker = Shell.WindowTracker.get_default();
-            app = tracker.get_window_app(source.metaWindow);
-        }
+        let app = getAppFromSource(source);
+        if (app == null)
+            return false;
 
         let id = app.get_id();
 
@@ -310,6 +332,39 @@ const DragPlaceholderItem = new Lang.Class({
     }
 });
 
+const DashActor = new Lang.Class({
+    Name: 'DashActor',
+    Extends: St.Widget,
+
+    _init: function() {
+        let layout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.VERTICAL });
+        this.parent({ name: 'dash',
+                      layout_manager: layout,
+                      clip_to_allocation: true });
+    },
+
+    vfunc_allocate: function(box, flags) {
+        let contentBox = this.get_theme_node().get_content_box(box);
+        let availWidth = contentBox.x2 - contentBox.x1;
+
+        this.set_allocation(box, flags);
+
+        let [appIcons, showAppsButton] = this.get_children();
+        let [showAppsMinHeight, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
+
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = contentBox.x1;
+        childBox.y1 = contentBox.y1;
+        childBox.x2 = contentBox.x2;
+        childBox.y2 = contentBox.y2 - showAppsNatHeight;
+        appIcons.allocate(childBox, flags);
+
+        childBox.y1 = contentBox.y2 - showAppsNatHeight;
+        childBox.y2 = contentBox.y2;
+        showAppsButton.allocate(childBox, flags);
+    }
+});
+
 const Dash = new Lang.Class({
     Name: 'Dash',
 
@@ -325,14 +380,11 @@ const Dash = new Lang.Class({
         this._resetHoverTimeoutId = 0;
         this._labelShowing = false;
 
-        this._container = new St.BoxLayout({ name: 'dash',
-                                             vertical: true,
-                                             clip_to_allocation: true });
-
+        this._container = new DashActor();
         this._box = new St.BoxLayout({ vertical: true,
                                        clip_to_allocation: true });
         this._box._delegate = this;
-        this._container.add(this._box);
+        this._container.add_actor(this._box);
 
         this._showAppsIcon = new ShowAppsIcon();
         this._showAppsIcon.icon.setIconSize(this.iconSize);
@@ -340,7 +392,7 @@ const Dash = new Lang.Class({
 
         this.showAppsButton = this._showAppsIcon.toggleButton;
 
-        this._container.add(this._showAppsIcon.actor);
+        this._container.add_actor(this._showAppsIcon.actor);
 
         this.actor = new St.Bin({ child: this._container });
         this.actor.connect('notify::height', Lang.bind(this,
@@ -352,7 +404,6 @@ const Dash = new Lang.Class({
 
         this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
 
-        this._tracker = Shell.WindowTracker.get_default();
         this._appSystem = Shell.AppSystem.get_default();
 
         this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
@@ -395,31 +446,25 @@ const Dash = new Lang.Class({
 
     _endDrag: function() {
         this._clearDragPlaceholder();
+        this._showAppsIcon.setDragApp(null);
         DND.removeDragMonitor(this._dragMonitor);
     },
 
     _onDragMotion: function(dragEvent) {
-        let app = null;
-        if (dragEvent.source instanceof AppDisplay.AppWellIcon)
-            app = this._appSystem.lookup_app(dragEvent.source.getId());
-        else if (dragEvent.source.metaWindow)
-            app = this._tracker.get_window_app(dragEvent.source.metaWindow);
-        else
+        let app = getAppFromSource(dragEvent.source);
+        if (app == null)
             return DND.DragMotionResult.CONTINUE;
 
-        let id = app.get_id();
-
-        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
-
-        let srcIsFavorite = (id in favorites);
-
         let showAppsHovered =
                 this._showAppsIcon.actor.contains(dragEvent.targetActor);
 
         if (!this._box.contains(dragEvent.targetActor) || showAppsHovered)
             this._clearDragPlaceholder();
 
-        this._showAppsIcon.setHover(showAppsHovered);
+        if (showAppsHovered)
+            this._showAppsIcon.setDragApp(app);
+        else
+            this._showAppsIcon.setDragApp(null);
 
         return DND.DragMotionResult.CONTINUE;
     },
@@ -462,9 +507,11 @@ const Dash = new Lang.Class({
         let item = new DashItemContainer();
         item.setChild(display.actor);
 
+        // Override default AppWellIcon label_actor, now the
+        // accessible_name is set at DashItemContainer.setLabelText
+        display.actor.label_actor = null;
         item.setLabelText(app.get_name());
-        // Override default AppWellIcon label_actor
-        display.actor.label_actor = item.label;
+
         display.icon.setIconSize(this.iconSize);
         this._hookUpLabel(item);
 
@@ -574,8 +621,10 @@ const Dash = new Lang.Class({
             icon.setIconSize(this.iconSize);
 
             // Don't animate the icon size change when the overview
-            // is not visible or when initially filling the dash
-            if (!Main.overview.visible || !this._shownInitially)
+            // is transitioning, not visible or when initially filling
+            // the dash
+            if (!Main.overview.visible || Main.overview.animationInProgress ||
+                !this._shownInitially)
                 continue;
 
             let [targetWidth, targetHeight] = icon.icon.get_size();
@@ -699,8 +748,9 @@ const Dash = new Lang.Class({
         for (let i = 0; i < removedActors.length; i++) {
             let item = removedActors[i]._delegate;
 
-            // Don't animate item removal when the overview is hidden
-            if (Main.overview.visible)
+            // Don't animate item removal when the overview is transitioning
+            // or hidden
+            if (Main.overview.visible && !Main.overview.animationInProgress)
                 item.animateOutAndDestroy();
             else
                 item.destroy();
@@ -715,8 +765,9 @@ const Dash = new Lang.Class({
             return;
         }
 
-        // Don't animate item addition when the overview is hidden
-        if (!Main.overview.visible)
+        // Don't animate item addition when the overview is transitioning
+        // or hidden
+        if (!Main.overview.visible || Main.overview.animationInProgress)
             return;
 
         for (let i = 0; i < addedItems.length; i++)
@@ -732,11 +783,7 @@ const Dash = new Lang.Class({
     },
 
     handleDragOver : function(source, actor, x, y, time) {
-        let app = null;
-        if (source instanceof AppDisplay.AppWellIcon)
-            app = this._appSystem.lookup_app(source.getId());
-        else if (source.metaWindow)
-            app = this._tracker.get_window_app(source.metaWindow);
+        let app = getAppFromSource(source);
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed())
@@ -817,12 +864,7 @@ const Dash = new Lang.Class({
 
     // Draggable target interface
     acceptDrop : function(source, actor, x, y, time) {
-        let app = null;
-        if (source instanceof AppDisplay.AppWellIcon) {
-            app = this._appSystem.lookup_app(source.getId());
-        } else if (source.metaWindow) {
-            app = this._tracker.get_window_app(source.metaWindow);
-        }
+        let app = getAppFromSource(source);
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed()) {

js/ui/dateMenu.js

@@ -70,16 +70,8 @@ const DateMenuButton = new Lang.Class({
         this._date.style_class = 'datemenu-date-label';
         vbox.add(this._date);
 
-        if (Main.sessionMode.showCalendarEvents) {
-            this._eventSource = new Calendar.DBusEventSource();
-            this._eventList = new Calendar.EventsList(this._eventSource);
-        } else {
-            this._eventSource = null;
-            this._eventList = null;
-        }
-
-        // Calendar
-        this._calendar = new Calendar.Calendar(this._eventSource);
+        this._eventList = new Calendar.EventsList();
+        this._calendar = new Calendar.Calendar();
 
         this._calendar.connect('selected-date-changed',
                                Lang.bind(this, function(calendar, date) {
@@ -97,31 +89,34 @@ const DateMenuButton = new Lang.Class({
             separator.setColumnWidths(1);
             vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
 
+            item.actor.show_on_set_parent = false;
             item.actor.can_focus = false;
             item.actor.reparent(vbox);
+            this._dateAndTimeSeparator = separator;
         }
 
-        if (Main.sessionMode.showCalendarEvents) {
-            // Add vertical separator
+        this._separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                               pseudo_class: 'highlighted' });
+        this._separator.connect('repaint', Lang.bind(this, _onVertSepRepaint));
+        hbox.add(this._separator);
 
-            item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                        pseudo_class: 'highlighted' });
-            item.connect('repaint', Lang.bind(this, _onVertSepRepaint));
-            hbox.add(item);
+        // Fill up the second column
+        vbox = new St.BoxLayout({ name: 'calendarEventsArea',
+                                  vertical: true });
+        hbox.add(vbox, { expand: true });
 
-            // Fill up the second column
-            vbox = new St.BoxLayout({name:     'calendarEventsArea',
-                                     vertical: true});
-            hbox.add(vbox, { expand: true });
+        // Event list
+        vbox.add(this._eventList.actor, { expand: true });
 
-            // Event list
-            vbox.add(this._eventList.actor, { expand: true });
+        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
+        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        this._openCalendarItem.actor.can_focus = false;
+        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
 
-            item = new PopupMenu.PopupMenuItem(_("Open Calendar"));
-            item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-            item.actor.can_focus = false;
-            vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-        }
+        this._calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
+        this._calendarSettings.connect('changed::exec',
+                                       Lang.bind(this, this._calendarSettingsChanged));
+        this._calendarSettingsChanged();
 
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
@@ -151,6 +146,51 @@ const DateMenuButton = new Lang.Class({
         this._clock = new GnomeDesktop.WallClock();
         this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
         this._updateClockAndDate();
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
+    },
+
+    _calendarSettingsChanged: function() {
+        let exec = this._calendarSettings.get_string('exec');
+        let fullExec = GLib.find_program_in_path(exec);
+        this._openCalendarItem.actor.visible = fullExec != null;
+    },
+
+    _setEventsVisibility: function(visible) {
+        this._openCalendarItem.actor.visible = visible;
+        this._separator.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;
+          this._eventList.actor.get_parent().show();
+        } else {
+          this.menu._arrowAlignment = 0.5;
+          this._eventList.actor.get_parent().hide();
+        }
+    },
+
+    _setEventSource: function(eventSource) {
+        this._calendar.setEventSource(eventSource);
+        this._eventList.setEventSource(eventSource);
+    },
+
+    _sessionUpdated: function() {
+        let eventSource;
+        let showEvents = Main.sessionMode.showCalendarEvents;
+        if (showEvents) {
+            eventSource = new Calendar.DBusEventSource();
+        } else {
+            eventSource = null;
+        }
+        this._setEventSource(eventSource);
+        this._setEventsVisibility(showEvents);
+
+        // This needs to be handled manually, as the code to
+        // autohide separators doesn't work across the vbox
+        this._dateAndTimeSeparator.actor.visible = Main.sessionMode.allowSettings;
     },
 
     _updateClockAndDate: function() {
@@ -165,14 +205,13 @@ const DateMenuButton = new Lang.Class({
 
     _onOpenCalendarActivate: function() {
         this.menu.close();
-        let calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
-        let tool = calendarSettings.get_string('exec');
+        let tool = this._calendarSettings.get_string('exec');
         if (tool.length == 0 || tool.substr(0, 9) == 'evolution') {
             // TODO: pass the selected day
             let app = Shell.AppSystem.get_default().lookup_app('evolution-calendar.desktop');
             app.activate();
         } else {
-            let needTerm = calendarSettings.get_boolean('needs-term');
+            let needTerm = this._calendarSettings.get_boolean('needs-term');
             if (needTerm) {
                 let terminalSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.terminal' });
                 let term = terminalSettings.get_string('exec');

js/ui/dnd.js

@@ -235,6 +235,10 @@ const _Draggable = new Lang.Class({
 
         if (this.actor._delegate && this.actor._delegate.getDragActor) {
             this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
+            this._dragActor.reparent(Main.uiGroup);
+            this._dragActor.raise_top();
+            Shell.util_set_hidden_from_pick(this._dragActor, true);
+
             // Drag actor does not always have to be the same as actor. For example drag actor
             // can be an image that's part of the actor. So to perform "snap back" correctly we need
             // to know what was the drag actor source.
@@ -263,12 +267,17 @@ const _Draggable = new Lang.Class({
             this._dragOffsetY = this._dragActor.y - this._dragStartY;
         } else {
             this._dragActor = this.actor;
+
             this._dragActorSource = undefined;
             this._dragOrigParent = this.actor.get_parent();
             this._dragOrigX = this._dragActor.x;
             this._dragOrigY = this._dragActor.y;
             this._dragOrigScale = this._dragActor.scale_x;
 
+            this._dragActor.reparent(Main.uiGroup);
+            this._dragActor.raise_top();
+            Shell.util_set_hidden_from_pick(this._dragActor, true);
+
             let [actorStageX, actorStageY] = this.actor.get_transformed_position();
             this._dragOffsetX = actorStageX - this._dragStartX;
             this._dragOffsetY = actorStageY - this._dragStartY;
@@ -280,10 +289,6 @@ const _Draggable = new Lang.Class({
                                  scaledHeight / this.actor.height);
         }
 
-        this._dragActor.reparent(Main.uiGroup);
-        this._dragActor.raise_top();
-        Shell.util_set_hidden_from_pick(this._dragActor, true);
-
         this._dragOrigOpacity = this._dragActor.opacity;
         if (this._dragActorOpacity != undefined)
             this._dragActor.opacity = this._dragActorOpacity;

js/ui/extensionSystem.js

@@ -8,6 +8,7 @@ const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
 const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 
 const ExtensionState = {
     ENABLED: 1,
@@ -38,6 +39,9 @@ const disconnect = Lang.bind(_signals, _signals.disconnect);
 
 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';
 
+var initted = false;
+var enabled;
+
 function disableExtension(uuid) {
     let extension = ExtensionUtils.extensions[uuid];
     if (!extension)
@@ -102,8 +106,6 @@ function enableExtension(uuid) {
 
     extensionOrder.push(uuid);
 
-    extension.stateObj.enable();
-
     let stylesheetFile = extension.dir.get_child('stylesheet.css');
     if (stylesheetFile.query_exists(null)) {
         let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
@@ -111,6 +113,8 @@ function enableExtension(uuid) {
         extension.stylesheet = stylesheetFile;
     }
 
+    extension.stateObj.enable();
+
     extension.state = ExtensionState.ENABLED;
     _signals.emit('extension-state-changed', extension);
 }
@@ -216,6 +220,9 @@ function initExtension(uuid) {
 function onEnabledExtensionsChanged() {
     let newEnabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
 
+    if (!enabled)
+        return;
+
     // Find and enable all the newly enabled extensions: UUIDs found in the
     // new setting, but not in the old one.
     newEnabledExtensions.filter(function(uuid) {
@@ -243,7 +250,7 @@ function onEnabledExtensionsChanged() {
     enabledExtensions = newEnabledExtensions;
 }
 
-function loadExtensions() {
+function _loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
     enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
 
@@ -257,3 +264,43 @@ function loadExtensions() {
     });
     finder.scanExtensions();
 }
+
+function enableAllExtensions() {
+    if (enabled)
+        return;
+
+    if (!initted) {
+        _loadExtensions();
+        initted = true;
+    } else {
+        enabledExtensions.forEach(function(uuid) {
+            enableExtension(uuid);
+        });
+    }
+    enabled = true;
+}
+
+function disableAllExtensions() {
+    if (!enabled)
+        return;
+
+    if (initted) {
+        enabledExtensions.forEach(function(uuid) {
+            disableExtension(uuid);
+        });
+    }
+
+    enabled = false;
+}
+
+function _sessionUpdated() {
+    if (Main.sessionMode.allowExtensions)
+        enableAllExtensions();
+    else
+        disableAllExtensions();
+}
+
+function init() {
+    Main.sessionMode.connect('updated', _sessionUpdated);
+    _sessionUpdated();
+}

js/ui/grabHelper.js

@@ -10,11 +10,12 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 
-function _navigateActor(actor, needsGrab) {
+function _navigateActor(actor) {
     if (!actor)
         return;
 
-    if (needsGrab && actor instanceof St.Widget)
+    let needsGrab = true;
+    if (actor instanceof St.Widget)
         needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     if (needsGrab)
         actor.grab_key_focus();
@@ -84,11 +85,7 @@ const GrabHelper = new Lang.Class({
     },
 
     get currentGrab() {
-        let idx = this._grabStack.length - 1;
-        while (idx >= 0 && this._grabStack[idx].untracked)
-            idx--;
-
-        return this._grabStack[idx] || {};
+        return this._grabStack[this._grabStack.length - 1] || {};
     },
 
     _findStackIndex: function(actor) {
@@ -137,14 +134,9 @@ const GrabHelper = new Lang.Class({
     // 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).
-    //
-    // If @params contains { untracked: true }, then it will be skipped
-    // when the grab helper ungrabs for you, or when calculating
-    // currentGrab.
     grab: function(params) {
         params = Params.parse(params, { actor: null,
                                         modal: false,
-                                        untracked: false,
                                         grabFocus: false,
                                         onUngrab: null });
 
@@ -155,55 +147,109 @@ const GrabHelper = new Lang.Class({
         if (this.isActorGrabbed(params.actor))
             return true;
 
-        if (this._grabFocusCount == 0 && this._modalCount == 0) {
-            if (!this._fullGrab(hadFocus, params.modal, params.grabFocus))
-                return false;
-        }
-
         params.savedFocus = focus;
+
+        if (params.modal && !this._takeModalGrab())
+            return false;
+
+        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
+            return false;
+
+        if (hadFocus || params.grabFocus)
+            _navigateActor(newFocus);
+
         this._grabStack.push(params);
-
-        if (params.modal)
-            this._modalCount++;
-
-        if (params.grabFocus)
-            this._grabFocusCount++;
-
-        _navigateActor(newFocus, hadFocus);
-
         return true;
     },
 
-    _fullGrab: function(hadFocus, modal, grabFocus) {
-        let metaDisplay = global.screen.get_display();
-
-        if (modal) {
+    _takeModalGrab: function() {
+        let firstGrab = (this._modalCount == 0);
+        if (firstGrab) {
             if (!Main.pushModal(this._owner))
                 return false;
+
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+            this._eventId = global.stage.connect('event', Lang.bind(this, this._onEvent));
         }
 
-        this._grabbedFromKeynav = hadFocus;
-        this._preGrabInputMode = global.stage_input_mode;
-        this._prevFocusedWindow = null;
+        this._modalCount++;
+        return true;
+    },
 
-        if (grabFocus) {
+    _releaseModalGrab: function() {
+        this._modalCount--;
+        if (this._modalCount > 0)
+            return;
+
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+
+        if (this._eventId > 0) {
+            global.stage.disconnect(this._eventId);
+            this._eventId = 0;
+        }
+
+        Main.popModal(this._owner);
+        global.sync_pointer();
+    },
+
+    _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;
             this._prevFocusedWindow = metaDisplay.focus_window;
+
             if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
                 this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
                 global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
             }
-        }
 
-        if (modal || grabFocus) {
-            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-            this._eventId = global.stage.connect('event', Lang.bind(this, this._onEvent));
             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._focusWindowChanged > 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);
+        }
+
+        if (this._prevFocusedWindow) {
+            let metaDisplay = global.screen.get_display();
+            if (!metaDisplay.focus_window) {
+                metaDisplay.set_input_focus_window(this._prevFocusedWindow,
+                                                   false, global.get_current_time());
+            }
+        }
+    },
+
     // ignoreRelease:
     //
     // Make sure that the next button release event evaluated by the
@@ -228,12 +274,14 @@ const GrabHelper = new Lang.Class({
         if (grabStackIndex < 0)
             return;
 
+        let focus = global.stage.key_focus;
+        let hadFocus = focus && this._isWithinGrabbedActor(focus);
+
         let poppedGrabs = this._grabStack.slice(grabStackIndex);
         // "Pop" all newly ungrabbed actors off the grab stack
         // by truncating the array.
         this._grabStack.length = grabStackIndex;
 
-        let wasModal = this._modalCount > 0;
         for (let i = poppedGrabs.length - 1; i >= 0; i--) {
             let poppedGrab = poppedGrabs[i];
 
@@ -241,63 +289,15 @@ const GrabHelper = new Lang.Class({
                 poppedGrab.onUngrab();
 
             if (poppedGrab.modal)
-                this._modalCount--;
+                this._releaseModalGrab();
 
             if (poppedGrab.grabFocus)
-                this._grabFocusCount--;
+                this._releaseFocusGrab();
         }
 
-        let focus = global.stage.key_focus;
-        let hadFocus = focus && this._isWithinGrabbedActor(focus);
-
-        if (this._grabFocusCount == 0 && this._modalCount == 0)
-            this._fullUngrab(wasModal);
-
-        let poppedGrab = poppedGrabs[0];
-        _navigateActor(poppedGrab.savedFocus, hadFocus);
-    },
-
-    _fullUngrab: function(wasModal) {
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-
-        if (this._eventId > 0) {
-            global.stage.disconnect(this._eventId);
-            this._eventId = 0;
-        }
-
-        if (this._keyFocusNotifyId > 0) {
-            global.stage.disconnect(this._keyFocusNotifyId);
-            this._keyFocusNotifyId = 0;
-        }
-
-        if (!this._focusWindowChanged > 0) {
-            let metaDisplay = global.screen.get_display();
-            metaDisplay.disconnect(this._focusWindowChangedId);
-            this._focusWindowChangedId = 0;
-        }
-
-        let prePopInputMode = global.stage_input_mode;
-
-        if (wasModal) {
-            Main.popModal(this._owner);
-            global.sync_pointer();
-        }
-
-        if (this._grabbedFromKeynav) {
-            if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED &&
-                prePopInputMode != Shell.StageInputMode.FULLSCREEN)
-                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-        }
-
-        if (this._prevFocusedWindow) {
-            let metaDisplay = global.screen.get_display();
-            if (!metaDisplay.focus_window) {
-                metaDisplay.set_input_focus_window(this._prevFocusedWindow,
-                                                   false, global.get_current_time());
-            }
+        if (hadFocus) {
+            let poppedGrab = poppedGrabs[0];
+            _navigateActor(poppedGrab.savedFocus);
         }
     },
 
@@ -318,12 +318,15 @@ const GrabHelper = new Lang.Class({
         if (this._isWithinGrabbedActor(event.get_source()))
             return false;
 
+        if (Main.keyboard.shouldTakeEvent(event))
+            return false;
+
         if (button) {
             // If we have a press event, ignore the next event,
             // which should be a release event.
             if (press)
                 this._ignoreRelease = true;
-            this.ungrab();
+            this.ungrab({ actor: this._grabStack[0].actor });
         }
 
         return this._modalCount > 0;

js/ui/keyboard.js

@@ -200,8 +200,10 @@ const Keyboard = new Lang.Class({
         this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
 
         this.actor = null;
+        this._focusInTray = false;
+        this._focusInExtendedKeys = false;
 
-        this._timestamp = global.get_current_time();
+        this._timestamp = global.display.get_current_time_roundtrip();
         Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
 
         this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
@@ -288,7 +290,15 @@ const Keyboard = new Lang.Class({
 
         // Showing an extended key popup and clicking a key from the extended keys
         // will grab focus, but ignore that
-        if (focus && (focus._extended_keys || (focus._key && focus._key.extended_key)))
+        let extendedKeysWereFocused = this._focusInExtendedKeys;
+        this._focusInExtendedKeys = focus && (focus._extended_keys || focus.extended_key);
+        if (this._focusInExtendedKeys || extendedKeysWereFocused)
+            return;
+
+        // Ignore focus changes caused by message tray showing/hiding
+        let trayWasFocused = this._focusInTray;
+        this._focusInTray = (focus && Main.messageTray.actor.contains(focus));
+        if (this._focusInTray || trayWasFocused)
             return;
 
         let time = global.get_current_time();
@@ -339,6 +349,13 @@ const Keyboard = new Lang.Class({
             trayButton.reactive = true;
             trayButton.remove_style_pseudo_class('grayed');
         }));
+        Main.sessionMode.connect('updated', Lang.bind(this, function() {
+            trayButton.reactive = !Main.sessionMode.isLocked;
+            if (Main.sessionMode.isLocked)
+                trayButton.add_style_pseudo_class('grayed');
+            else
+                trayButton.remove_style_pseudo_class('grayed');
+        }));
 
         return trayButton;
     },
@@ -468,6 +485,12 @@ const Keyboard = new Lang.Class({
         }
     },
 
+    shouldTakeEvent: function(event) {
+        let actor = event.get_source();
+        return Main.layoutManager.keyboardBox.contains(actor) ||
+               actor._extended_keys || actor.extended_key;
+    },
+
     show: function () {
         this._redraw();
 
@@ -494,15 +517,30 @@ const Keyboard = new Lang.Class({
             this._moveTemporarily();
     },
 
+    // _compareTimestamp:
+    //
+    // Compare two timestamps taking into account
+    // CURRENT_TIME (0)
+    _compareTimestamp: function(one, two) {
+        if (one == two)
+            return 0;
+        if (one == Clutter.CURRENT_TIME)
+            return 1;
+        if (two == Clutter.CURRENT_TIME)
+            return -1;
+        return one - two;
+    },
+
     // D-Bus methods
     Show: function(timestamp) {
         if (!this._enableKeyboard)
             return;
 
-        if (timestamp - this._timestamp < 0)
+        if (this._compareTimestamp(timestamp, this._timestamp) < 0)
             return;
 
-        this._timestamp = timestamp;
+        if (timestamp != Clutter.CURRENT_TIME)
+            this._timestamp = timestamp;
         this.show();
     },
 
@@ -510,10 +548,11 @@ const Keyboard = new Lang.Class({
         if (!this._enableKeyboard)
             return;
 
-        if (timestamp - this._timestamp < 0)
+        if (this._compareTimestamp(timestamp, this._timestamp) < 0)
             return;
 
-        this._timestamp = timestamp;
+        if (timestamp != Clutter.CURRENT_TIME)
+            this._timestamp = timestamp;
         this.hide();
     },
 
@@ -543,6 +582,7 @@ const KeyboardSource = new Lang.Class({
     _init: function(keyboard) {
         this._keyboard = keyboard;
         this.parent(_("Keyboard"), 'input-keyboard-symbolic');
+        this.keepTrayOnSummaryClick = true;
     },
 
     handleSummaryClick: function() {

js/ui/layout.js

@@ -17,6 +17,7 @@ const Tweener = imports.ui.tweener;
 const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;
 const STARTUP_ANIMATION_TIME = 0.2;
 const KEYBOARD_ANIMATION_TIME = 0.5;
+const PLYMOUTH_TRANSITION_TIME = 1;
 
 const MonitorConstraint = new Lang.Class({
     Name: 'MonitorConstraint',
@@ -42,6 +43,8 @@ const MonitorConstraint = new Lang.Class({
     },
 
     set primary(v) {
+        if (v)
+            this._index = -1;
         this._primary = v;
         if (this.actor)
             this.actor.queue_relayout();
@@ -53,6 +56,7 @@ const MonitorConstraint = new Lang.Class({
     },
 
     set index(v) {
+        this._primary = false;
         this._index = v;
         if (this.actor)
             this.actor.queue_relayout();
@@ -100,6 +104,7 @@ const LayoutManager = new Lang.Class({
         this.primaryMonitor = null;
         this.primaryIndex = -1;
         this._hotCorners = [];
+        this._rootPixmap = null;
         this._leftPanelBarrier = 0;
         this._rightPanelBarrier = 0;
         this._trayBarrier = 0;
@@ -120,7 +125,8 @@ const LayoutManager = new Lang.Class({
         this.panelBox.connect('allocation-changed',
                               Lang.bind(this, this._updatePanelBarriers));
 
-        this.trayBox = new St.BoxLayout({ name: 'trayBox' }); 
+        this.trayBox = new St.Widget({ name: 'trayBox',
+                                       layout_manager: new Clutter.BinLayout() }); 
         this.addChrome(this.trayBox);
         this.trayBox.connect('allocation-changed',
                              Lang.bind(this, this._updateTrayBarrier));
@@ -318,10 +324,41 @@ const LayoutManager = new Lang.Class({
     },
 
     _startupAnimation: function() {
+        this.panelBox.anchor_y = this.panelBox.height;
+
+        let plymouthTransitionRunning = false;
+
+        // If we're the greeter, put up the xrootpmap actor
+        // and fade it out to have a nice transition from plymouth
+        // to the greeter. Otherwise, we'll just animate the panel,
+        // as usual.
+        if (Main.sessionMode.isGreeter) {
+            this._rootPixmap = global.create_xrootpmap_texture();
+            if (this._rootPixmap != null) {
+                Main.uiGroup.add_actor(this._rootPixmap);
+                Tweener.addTween(this._rootPixmap,
+                                 { opacity: 0,
+                                   time: PLYMOUTH_TRANSITION_TIME,
+                                   transition: 'linear',
+                                   onComplete: this._fadeRootpmapComplete,
+                                   onCompleteScope: this });
+                plymouthTransitionRunning = true;
+            }
+        }
+
+        if (!plymouthTransitionRunning)
+            this._fadeRootpmapComplete();
+    },
+
+    _fadeRootpmapComplete: function() {
         // Don't animate the strut
         this._chrome.freezeUpdateRegions();
 
-        this.panelBox.anchor_y = this.panelBox.height;
+        if (this._rootPixmap != null) {
+            this._rootPixmap.destroy();
+            this._rootPixmap = null;
+        }
+
         Tweener.addTween(this.panelBox,
                          { anchor_y: 0,
                            time: STARTUP_ANIMATION_TIME,
@@ -336,7 +373,6 @@ const LayoutManager = new Lang.Class({
     },
 
     showKeyboard: function () {
-        Main.messageTray.hide();
         this.keyboardBox.raise_top();
         Tweener.addTween(this.keyboardBox,
                          { anchor_y: this.keyboardBox.height,
@@ -350,6 +386,8 @@ const LayoutManager = new Lang.Class({
                            time: KEYBOARD_ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });
+
+        this.emit('keyboard-visible-changed', true);
     },
 
     _showKeyboardComplete: function() {
@@ -364,7 +402,6 @@ const LayoutManager = new Lang.Class({
     },
 
     hideKeyboard: function (immediate) {
-        Main.messageTray.hide();
         if (this._keyboardHeightNotifyId) {
             this.keyboardBox.disconnect(this._keyboardHeightNotifyId);
             this._keyboardHeightNotifyId = 0;
@@ -381,6 +418,8 @@ const LayoutManager = new Lang.Class({
                            time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });
+
+        this.emit('keyboard-visible-changed', false);
     },
 
     _hideKeyboardComplete: function() {
@@ -639,7 +678,6 @@ const Chrome = new Lang.Class({
 
         this._monitors = [];
         this._inOverview = false;
-        this._isLocked = false;
         this._updateRegionIdle = 0;
         this._freezeUpdateCount = 0;
 
@@ -658,12 +696,9 @@ const Chrome = new Lang.Class({
     },
 
     init: function() {
-        Main.overview.connect('showing',
-                             Lang.bind(this, this._overviewShowing));
-        Main.overview.connect('hidden',
-                             Lang.bind(this, this._overviewHidden));
-        Main.screenShield.connect('lock-status-changed',
-                                  Lang.bind(this, this._lockStatusChanged));
+        Main.overview.connect('showing', Lang.bind(this, this._overviewShowing));
+        Main.overview.connect('hidden', Lang.bind(this, this._overviewHidden));
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
     },
 
     addActor: function(actor, params) {
@@ -749,10 +784,13 @@ const Chrome = new Lang.Class({
 
     _actorReparented: function(actor, oldParent) {
         let newParent = actor.get_parent();
-        if (!newParent)
+        if (!newParent) {
             this._untrackActor(actor);
-        else
+        } else {
+            let i = this._findActor(actor);
+            let actorData = this._trackedActors[i];
             actorData.isToplevel = (newParent == Main.uiGroup);
+        }
     },
 
     _updateVisibility: function() {
@@ -763,7 +801,7 @@ const Chrome = new Lang.Class({
             if (!actorData.isToplevel)
                 continue;
 
-            if (this._inOverview || this._isLocked)
+            if (this._inOverview || !Main.sessionMode.hasWindows)
                 visible = true;
             else if (this.findMonitorForActor(actorData.actor).inFullscreen)
                 visible = false;
@@ -785,8 +823,7 @@ const Chrome = new Lang.Class({
         this._queueUpdateRegions();
     },
 
-    _lockStatusChanged: function(shield, locked) {
-        this._isLocked = locked;
+    _sessionUpdated: function() {
         this._updateVisibility();
         this._queueUpdateRegions();
     },

js/ui/lookingGlass.js

@@ -371,7 +371,8 @@ const ObjInspector = new Lang.Class({
 
         this._parentList = [];
 
-        this.actor = new St.ScrollView({ x_fill: true, y_fill: true });
+        this.actor = new St.ScrollView({ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+                                         x_fill: true, y_fill: true });
         this.actor.get_hscroll_bar().hide();
         this._container = new St.BoxLayout({ name: 'LookingGlassPropertyInspector',
                                              style_class: 'lg-dialog',
@@ -443,10 +444,6 @@ const ObjInspector = new Lang.Class({
         this.actor.show();
         if (sourceActor) {
             this.actor.set_scale(0, 0);
-            let [sourceX, sourceY] = sourceActor.get_transformed_position();
-            let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
-            this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2),
-                                         Math.floor(sourceY + sourceHeight / 2));
             Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1,
                                            transition: 'easeOutQuad',
                                            time: 0.2 });
@@ -1092,8 +1089,8 @@ const LookingGlass = new Lang.Class({
         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) {

js/ui/main.js

@@ -10,12 +10,9 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
-const AutomountManager = imports.ui.automountManager;
-const AutorunManager = imports.ui.autorunManager;
+const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
-const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-const KeyringPrompt = imports.ui.keyringPrompt;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
@@ -23,11 +20,9 @@ const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
-const PlaceDisplay = imports.ui.placeDisplay;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
 const LookingGlass = imports.ui.lookingGlass;
-const NetworkAgent = imports.ui.networkAgent;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const ScreenShield = imports.ui.screenShield;
@@ -35,7 +30,6 @@ const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
 const ShellMountOperation = imports.ui.shellMountOperation;
-const TelepathyClient = imports.ui.telepathyClient;
 const UnlockDialog = imports.ui.unlockDialog;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
@@ -43,10 +37,9 @@ const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
 const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2266bbff);
+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
-let automountManager = null;
-let autorunManager = null;
+let componentManager = null;
 let panel = null;
 let overview = null;
 let runDialog = null;
@@ -56,9 +49,7 @@ let messageTray = null;
 let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
-let telepathyClient = null;
 let ctrlAltTabManager = null;
-let recorder = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
@@ -70,7 +61,6 @@ let magnifier = null;
 let xdndHandler = null;
 let keyboard = null;
 let layoutManager = null;
-let networkAgent = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
@@ -78,69 +68,10 @@ let _overridesSettings = null;
 
 let background = null;
 
-function createUserSession() {
-    telepathyClient = new TelepathyClient.Client();
-    automountManager = new AutomountManager.AutomountManager();
-    autorunManager = new AutorunManager.AutorunManager();
-    networkAgent = new NetworkAgent.NetworkAgent();
-
-    _initRecorder();
-}
-
-function createGDMSession() {
-    screenShield.showDialog();
-}
-
-function createGDMLoginDialog(parentActor) {
-    // We do this this here instead of at the top to prevent GDM
-    // related code from getting loaded in normal user sessions
-    const LoginDialog = imports.gdm.loginDialog;
-
-    let loginDialog = new LoginDialog.LoginDialog(parentActor);
-    return [loginDialog, true];
-}
-
-function createSessionUnlockDialog(parentActor) {
-    let dialog = new UnlockDialog.UnlockDialog(parentActor);
-    return [dialog, false];
-}
-
-function createInitialSetupSession() {
-    networkAgent = new NetworkAgent.NetworkAgent();
-}
-
-function _initRecorder() {
-    let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
-    let desktopLockdownSettings = new Gio.Settings({ schema: 'org.gnome.desktop.lockdown' });
-    let bindingSettings = new Gio.Settings({ schema: 'org.gnome.shell.keybindings' });
-
-    global.display.add_keybinding('toggle-recording',
-                                  bindingSettings,
-                                  Meta.KeyBindingFlags.NONE, function() {
-        if (recorder == null) {
-            recorder = new Shell.Recorder({ stage: global.stage });
-        }
-
-        if (recorder.is_recording()) {
-            recorder.close();
-            Meta.enable_unredirect_for_screen(global.screen);
-        } else if (!desktopLockdownSettings.get_boolean('disable-save-to-disk')) {
-            // read the parameters from GSettings always in case they have changed
-            recorder.set_framerate(recorderSettings.get_int('framerate'));
-            /* Translators: this is a filename used for screencast recording */
-            // xgettext:no-c-format
-            recorder.set_filename(_("Screencast from %d %t") + '.' + recorderSettings.get_string('file-extension'));
-            let pipeline = 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();
-        }
-    });
+function _sessionUpdated() {
+    Meta.keybindings_set_custom_handler('panel-run-dialog', sessionMode.hasRunDialog ? openRunDialog : null);
+    if (sessionMode.isGreeter)
+        screenShield.showDialog();
 }
 
 function start() {
@@ -206,51 +137,34 @@ function start() {
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     overview = new Overview.Overview();
     magnifier = new Magnifier.Magnifier();
-    screenShield = new ScreenShield.ScreenShield();
-    screenSaverDBus = new ShellDBus.ScreenSaverDBus();
+    if (UnlockDialog.isSupported())
+        screenShield = new ScreenShield.ScreenShield();
+    else
+        screenShield = new ScreenShield.ScreenShieldFallback();
     panel = new Panel.Panel();
     wm = new WindowManager.WindowManager();
     messageTray = new MessageTray.MessageTray();
     keyboard = new Keyboard.Keyboard();
     notificationDaemon = new NotificationDaemon.NotificationDaemon();
     windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
+    componentManager = new Components.ComponentManager();
 
-    sessionMode.createSession();
-
-    panel.init();
     layoutManager.init();
     keyboard.init();
     overview.init();
 
-    if (sessionMode.hasWorkspaces)
-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                            false, -1, 1);
+    Meta.keybindings_set_custom_handler('panel-main-menu', Lang.bind(overview, overview.toggle));
+    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
 
-    if (sessionMode.hasRunDialog) {
-        Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
-           getRunDialog().open();
-        });
-    }
-
-    if (sessionMode.hasOverview) {
-        Meta.keybindings_set_custom_handler('panel-main-menu', function () {
-            overview.toggle();
-        });
-
-        global.display.connect('overlay-key',
-                               Lang.bind(overview, overview.toggle));
-    }
+    sessionMode.connect('update', _sessionUpdated);
+    _sessionUpdated();
 
     // Provide the bus object for gnome-session to
     // initiate logouts.
     EndSessionDialog.init();
 
-    // Attempt to become a PolicyKit authentication agent
-    PolkitAuthenticationAgent.init()
-
-    // Become a prompter for gnome keyring
-    KeyringPrompt.init();
-
     _startDate = new Date();
 
     global.stage.connect('captured-event', _globalKeyPressHandler);
@@ -275,10 +189,8 @@ function start() {
 
     _nWorkspacesChanged();
 
-    if (sessionMode.allowExtensions) {
-        ExtensionDownloader.init();
-        ExtensionSystem.loadExtensions();
-    }
+    ExtensionDownloader.init();
+    ExtensionSystem.init();
 }
 
 let _workspaces = [];
@@ -522,7 +434,6 @@ function notify(msg, details) {
     messageTray.add(source);
     let notification = new MessageTray.Notification(source, msg, details);
     notification.setTransient(true);
-    notification.setShowWhenLocked(true);
     source.notify(notification);
 }
 
@@ -617,7 +528,7 @@ function _globalKeyPressHandler(actor, event) {
             if (!sessionMode.hasRunDialog)
                 return false;
 
-            getRunDialog().open();
+            openRunDialog();
             return true;
         case Meta.KeyBindingAction.PANEL_MAIN_MENU:
         case Meta.KeyBindingAction.OVERLAY_KEY:
@@ -763,11 +674,11 @@ function createLookingGlass() {
     return lookingGlass;
 }
 
-function getRunDialog() {
+function openRunDialog() {
     if (runDialog == null) {
         runDialog = new RunDialog.RunDialog();
     }
-    return runDialog;
+    runDialog.open();
 }
 
 /**

js/ui/messageTray.js

@@ -242,7 +242,10 @@ function makeCloseButton() {
 
     closeButton.connect('style-changed', function() {
         let themeNode = closeButton.get_theme_node();
-        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
+
+        // libcroco doesn't support negative units
+        let direction = closeButton.get_text_direction() == Clutter.TextDirection.RTL ? -1 : 1;
+        closeButton.translation_x = direction * themeNode.get_length('-shell-close-overlap-x');
 
         // libcroco doesn't support negative units
         closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
@@ -318,7 +321,7 @@ const Notification = new Lang.Class({
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
         this.expanded = false;
-        this.showWhenLocked = false;
+        this.focused = false;
         this.acknowledged = false;
         this._destroyed = false;
         this._useActionIcons = false;
@@ -711,14 +714,6 @@ const Notification = new Lang.Class({
         this.isTransient = isTransient;
     },
 
-    setShowWhenLocked: function(show) {
-        if (show && !this.isTransient) {
-            throw new Error('ShowWhenLocked can only be set on a transient notification');
-        }
-
-        this.showWhenLocked = show;
-    },
-
     setUseActionIcons: function(useIcons) {
         this._useActionIcons = useIcons;
     },
@@ -952,11 +947,22 @@ const SourceActor = new Lang.Class({
         }));
         this._actorDestroyed = false;
 
-        this._counterLabel = new St.Label();
+        this._counterLabel = new St.Label( {x_align: Clutter.ActorAlign.CENTER,
+                                            x_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER,
+                                            y_expand: true });
+
         this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel });
+                                        child: this._counterLabel,
+                                        layout_manager: new Clutter.BinLayout() });
         this._counterBin.hide();
 
+        this._counterBin.connect('style-changed', Lang.bind(this, function() {
+            let themeNode = this._counterBin.get_theme_node();
+            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
+            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
+        }));
+
         this._iconBin = new St.Bin({ width: size,
                                      height: size,
                                      x_fill: true,
@@ -1025,7 +1031,14 @@ const SourceActor = new Lang.Class({
             return;
 
         this._counterBin.visible = this._source.countVisible;
-        this._counterLabel.set_text(this._source.count.toString());
+
+        let text;
+        if (this._source.count < 100)
+            text = this._source.count.toString();
+        else
+            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
+
+        this._counterLabel.set_text(text);
     }
 });
 
@@ -1042,6 +1055,7 @@ const Source = new Lang.Class({
         this.isChat = false;
         this.isMuted = false;
         this.showInLockScreen = true;
+        this.keepTrayOnSummaryClick = false;
 
         this.notifications = [];
     },
@@ -1062,6 +1076,27 @@ const Source = new Lang.Class({
         this.emit('count-updated');
     },
 
+    buildRightClickMenu: function() {
+        let item;
+        let rightClickMenu = new St.BoxLayout({ name: 'summary-right-click-menu',
+                                                vertical: true });
+
+        item = new PopupMenu.PopupMenuItem(_("Open"));
+        item.connect('activate', Lang.bind(this, function() {
+            this.open();
+            this.emit('done-displaying-content');
+        }));
+        rightClickMenu.add(item.actor);
+
+        item = new PopupMenu.PopupMenuItem(_("Remove"));
+        item.connect('activate', Lang.bind(this, function() {
+            this.destroy();
+            this.emit('done-displaying-content');
+        }));
+        rightClickMenu.add(item.actor);
+        return rightClickMenu;
+    },
+
     setTransient: function(isTransient) {
         this.isTransient = isTransient;
     },
@@ -1190,6 +1225,7 @@ const SummaryItem = new Lang.Class({
                                      can_focus: true,
                                      track_hover: true });
         this.actor.label_actor = new St.Label({ text: source.title });
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
         this._sourceBox = new St.BoxLayout({ style_class: 'summary-source' });
 
         this._sourceIcon = source.getSummaryIcon();
@@ -1198,13 +1234,6 @@ const SummaryItem = new Lang.Class({
 
         this.notificationStackWidget = new St.Widget({ layout_manager: new Clutter.BinLayout() });
 
-        this._closeButton = makeCloseButton();
-        this._closeButton.connect('clicked', Lang.bind(this, function() {
-            source.destroy();
-            this.emit('done-displaying-content');
-        }));
-
-        this.notificationStackWidget.add_actor(this._closeButton);
         this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
                                                          vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
                                                          hscrollbar_policy: Gtk.PolicyType.NEVER });
@@ -1213,6 +1242,9 @@ const SummaryItem = new Lang.Class({
                                                     vertical: true });
         this.notificationStackView.add_actor(this.notificationStack);
         this.notificationStackWidget.add_actor(this.notificationStackView);
+
+        this.closeButton = makeCloseButton();
+        this.notificationStackWidget.add_actor(this.closeButton);
         this._stackedNotifications = [];
 
         this._oldMaxScrollAdjustment = 0;
@@ -1224,46 +1256,17 @@ const SummaryItem = new Lang.Class({
             this._oldMaxScrollAdjustment = adjustment.upper;
         }));
 
-        this.rightClickMenu = new St.BoxLayout({ name: 'summary-right-click-menu',
-                                                 vertical: true });
-
-        let item;
-
-        item = new PopupMenu.PopupMenuItem(_("Open"));
-        item.connect('activate', Lang.bind(this, function() {
-            source.open();
-            this.emit('done-displaying-content');
-        }));
-        this.rightClickMenu.add(item.actor);
-
-        item = new PopupMenu.PopupMenuItem(_("Remove"));
-        item.connect('activate', Lang.bind(this, function() {
-            source.destroy();
-            this.emit('done-displaying-content');
-        }));
-        this.rightClickMenu.add(item.actor);
-
-	if (source.isChat) {
-            item = new PopupMenu.PopupMenuItem('');
-            item.actor.connect('notify::mapped', Lang.bind(this, function() {
-                item.label.set_text(source.isMuted ? _("Unmute") : _("Mute"));
-            }));
-            item.connect('activate', Lang.bind(this, function() {
-                source.setMuted(!source.isMuted);
-                this.emit('done-displaying-content');
-            }));
-            this.rightClickMenu.add(item.actor);
-	}
-
-        global.focus_manager.add_group(this.rightClickMenu);
+        this.rightClickMenu = source.buildRightClickMenu();
+        if (this.rightClickMenu)
+            global.focus_manager.add_group(this.rightClickMenu);
     },
 
-    get closeButtonVisible() {
-        return this._closeButton.visible;
-    },
-
-    set closeButtonVisible(v) {
-        this._closeButton.visible = v;
+    _onKeyPress: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.KEY_Up) {
+            actor.emit('clicked', 1);
+            return true;
+        }
+        return false;
     },
 
     prepareNotificationStackForShowing: function() {
@@ -1330,7 +1333,7 @@ const SummaryItem = new Lang.Class({
     },
 
     _notificationDoneDisplaying: function() {
-        this.emit('done-displaying-content');
+        this.source.emit('done-displaying-content');
     },
 
     _notificationDestroyed: function(notification) {
@@ -1368,39 +1371,47 @@ const MessageTray = new Lang.Class({
         }));
 
         this.actor = new St.Widget({ name: 'message-tray',
-                                     layout_manager: new Clutter.BinLayout(),
                                      reactive: true,
-                                     track_hover: true });
-        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+                                     track_hover: true,
+                                     layout_manager: new Clutter.BinLayout(),
+                                     x_expand: true,
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.START,
+                                   });
         this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
 
         this._notificationWidget = new St.Widget({ name: 'notification-container',
+                                                   y_align: Clutter.ActorAlign.START,
+                                                   x_align: Clutter.ActorAlign.CENTER,
+                                                   y_expand: true,
+                                                   x_expand: true,
                                                    layout_manager: new Clutter.BinLayout() });
         this.actor.add_actor(this._notificationWidget);
 
-        this._notificationBin = new St.Bin();
+        this._notificationBin = new St.Bin({ y_expand: true });
+        this._notificationBin.set_y_align(Clutter.ActorAlign.START);
         this._notificationWidget.add_actor(this._notificationBin);
         this._notificationWidget.hide();
         this._notificationQueue = [];
         this._notification = null;
         this._notificationClickedId = 0;
 
-        this._summaryBin = new St.Bin({ x_align: St.Align.END,
-                                        y_expand: true, // this is the Clutter property
-                                        reactive: true });
-        this._summaryBin.connect('button-release-event', Lang.bind(this, function(actor, event) {
+        this.actor.connect('button-release-event', Lang.bind(this, function(actor, event) {
             this._setClickedSummaryItem(null);
             this._updateState();
             actor.grab_key_focus();
         }));
-        this.actor.add_actor(this._summaryBin);
+        global.focus_manager.add_group(this.actor);
         this._summary = new St.BoxLayout({ name: 'summary-mode',
                                            reactive: true,
-                                           track_hover: true });
-        global.focus_manager.add_group(this._summary);
+                                           track_hover: true,
+                                           x_align: Clutter.ActorAlign.END,
+                                           x_expand: true,
+                                           y_align: Clutter.ActorAlign.CENTER,
+                                           y_expand: true });
         this._summary.connect('notify::hover', Lang.bind(this, this._onSummaryHoverChanged));
-        this._summaryBin.child = this._summary;
-        this._summaryBin.opacity = 0;
+        this.actor.add_actor(this._summary);
+        this._summary.opacity = 0;
 
         this._summaryMotionId = 0;
         this._trayMotionId = 0;
@@ -1408,6 +1419,8 @@ const MessageTray = new Lang.Class({
         this._summaryBoxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
                                                             { reactive: true,
                                                               track_hover: true });
+        this._summaryBoxPointer.actor.connect('key-press-event',
+                                              Lang.bind(this, this._onSummaryBoxPointerKeyPress));
         this._summaryBoxPointer.actor.style_class = 'summary-boxpointer';
         this._summaryBoxPointer.actor.hide();
         Main.layoutManager.addChrome(this._summaryBoxPointer.actor);
@@ -1433,8 +1446,11 @@ const MessageTray = new Lang.Class({
         this._grabHelper = new GrabHelper.GrabHelper(this.actor);
         this._grabHelper.addActor(this._summaryBoxPointer.actor);
         this._grabHelper.addActor(this.actor);
+        if (Main.panel.statusArea.activities)
+            this._grabHelper.addActor(Main.panel.statusArea.activities.hotCorner.actor);
 
         Main.layoutManager.keyboardBox.connect('notify::hover', Lang.bind(this, this._onKeyboardHoverChanged));
+        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, this._onKeyboardVisibleChanged));
 
         this._trayState = State.HIDDEN;
         this._locked = false;
@@ -1443,13 +1459,16 @@ const MessageTray = new Lang.Class({
         this._trayLeftTimeoutId = 0;
         this._pointerInTray = false;
         this._pointerInKeyboard = false;
+        this._keyboardVisible = false;
         this._summaryState = State.HIDDEN;
         this._pointerInSummary = false;
+        this._notificationClosed = false;
         this._notificationState = State.HIDDEN;
         this._notificationTimeoutId = 0;
         this._notificationExpandedId = 0;
         this._summaryBoxPointerState = State.HIDDEN;
         this._summaryBoxPointerTimeoutId = 0;
+        this._desktopCloneState = State.HIDDEN;
         this._overviewVisible = Main.overview.visible;
         this._notificationRemoved = false;
         this._reNotifyAfterHideNotification = null;
@@ -1469,14 +1488,12 @@ const MessageTray = new Lang.Class({
         Main.layoutManager.trackChrome(this._notificationWidget);
         Main.layoutManager.trackChrome(this._closeButton);
 
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, function() {
-            this.actor.style_changed();
-        }));
         Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
 
         Main.overview.connect('showing', Lang.bind(this,
             function() {
                 this._overviewVisible = true;
+                this._grabHelper.ungrab(); // drop modal grab if necessary
                 this.actor.add_style_pseudo_class('overview');
                 this._updateState();
             }));
@@ -1488,8 +1505,7 @@ const MessageTray = new Lang.Class({
                 this._updateState();
             }));
 
-        this._isScreenLocked = false;
-        Main.screenShield.connect('lock-status-changed', Lang.bind(this, this._onScreenLockStatusChanged));
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
 
         global.display.add_keybinding('toggle-message-tray',
                                       new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
@@ -1503,6 +1519,19 @@ const MessageTray = new Lang.Class({
         pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
         this._trayDwellTimeoutId = 0;
         this._trayDwelling = false;
+        this._trayDwellUserTime = 0;
+
+        this._sessionUpdated();
+    },
+
+    _sessionUpdated: function() {
+        if (Main.sessionMode.isLocked || Main.sessionMode.isGreeter)
+            Main.ctrlAltTabManager.removeGroup(this._summary);
+        else
+            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
+                                            { focusCallback: Lang.bind(this, this.toggleAndNavigate),
+                                              sortGroup: CtrlAltTab.SortGroup.BOTTOM });
+        this._updateState();
     },
 
     _checkTrayDwell: function(x, y) {
@@ -1516,9 +1545,14 @@ const MessageTray = new Lang.Class({
             // of the monitor. The _trayDwelling variable is used so that we only try to
             // fire off one tray dwell - if it fails (because, say, the user has the mouse down),
             // we don't try again until the user moves the mouse up and down again.
-            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0)
+            if (!this._trayDwelling && !this.actor.hover && this._trayDwellTimeoutId == 0) {
+                // Save the interaction timestamp so we can detect user input
+                let focusWindow = global.display.focus_window;
+                this._trayDwellUserTime = focusWindow ? focusWindow.user_time : 0;
+
                 this._trayDwellTimeoutId = Mainloop.timeout_add(TRAY_DWELL_TIME,
                                                                 Lang.bind(this, this._trayDwellTimeout));
+            }
             this._trayDwelling = true;
         } else {
             this._cancelTrayDwell();
@@ -1534,6 +1568,16 @@ const MessageTray = new Lang.Class({
     },
 
     _trayDwellTimeout: function() {
+        if (Main.modalCount > 0)
+            return false;
+
+        // If the user interacted with the focus window since we started the tray
+        // dwell (by clicking or typing), don't activate the message tray
+        let focusWindow = global.display.focus_window;
+        let currentUserTime = focusWindow ? focusWindow.user_time : 0;
+        if (currentUserTime != this._trayDwellUserTime)
+            return false;
+
         this._trayDwellTimeoutId = 0;
 
         this._traySummoned = true;
@@ -1544,21 +1588,13 @@ const MessageTray = new Lang.Class({
 
     _onCloseClicked: function() {
         if (this._notificationState == State.SHOWN) {
-            this._notification.emit('done-displaying');
-                if (!this._notification.resident)
-                    this._notification.destroy();
+            this._closeButton.hide();
+            this._notificationClosed = true;
+            this._updateState();
+            this._notificationClosed = false;
         }
     },
 
-    _onStyleChanged: function() {
-        let monitor = Main.layoutManager.bottomMonitor;
-
-        let width = this._notificationWidget.get_width();
-        this._notificationWidget.x = Math.floor((monitor.width - width) / 2);
-        this._summaryBin.x = 0;
-        this._summaryBin.width = monitor.width;
-    },
-
     contains: function(source) {
         return this._getIndexOfSummaryItemForSource(source) >= 0;
     },
@@ -1668,11 +1704,6 @@ const MessageTray = new Lang.Class({
             this._notificationQueue.splice(index, 1);
     },
 
-    _onScreenLockStatusChanged: function(screenShield, locked) {
-        this._isScreenLocked = locked;
-        this._updateState();
-    },
-
     _lock: function() {
         this._locked = true;
     },
@@ -1691,10 +1722,8 @@ const MessageTray = new Lang.Class({
     },
 
     toggleAndNavigate: function() {
-        // Grab the key focus so that GrabHelper knows
-        // that we have the key grab.
-        this._summary.grab_key_focus();
         this.toggle();
+        this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
     hide: function() {
@@ -1747,7 +1776,10 @@ const MessageTray = new Lang.Class({
 
     _onSummaryItemClicked: function(summaryItem, button) {
         if (summaryItem.source.handleSummaryClick()) {
-            this._escapeTray();
+            if (summaryItem.source.keepTrayOnSummaryClick)
+                this._setClickedSummaryItem(null);
+            else
+                this._escapeTray();
         } else {
             if (!this._setClickedSummaryItem(summaryItem, button))
                 this._setClickedSummaryItem(null);
@@ -1838,6 +1870,20 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
+    _onKeyboardVisibleChanged: function(layoutManager, keyboardVisible) {
+        if (this._keyboardVisible == keyboardVisible)
+            return;
+
+        this._keyboardVisible = keyboardVisible;
+
+        if (keyboardVisible)
+            this.actor.add_style_pseudo_class('keyboard');
+        else
+            this.actor.remove_style_pseudo_class('keyboard');
+
+        this._updateState();
+    },
+
     _onFullscreenChanged: function(obj, state) {
         this._inFullscreen = state;
         this._updateState();
@@ -1898,34 +1944,26 @@ const MessageTray = new Lang.Class({
     // at the present time.
     _updateState: function() {
         // Notifications
-        let notificationQueue = this._notificationQueue.filter(Lang.bind(this, function(notification) {
-            if (this._isScreenLocked)
-                return notification.showWhenLocked;
-            else
-                return true;
-        }));
+        let notificationQueue = this._notificationQueue;
         let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
-        // notificationsLimited is false when the screen is locked, because they go through
-        // different filtering, and we want to show non urgent messages at times
-        let notificationsLimited = (this._busy || this._inFullscreen) && !this._isScreenLocked;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent);
+        let notificationsLimited = this._busy || this._inFullscreen;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
         let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
         let notificationExpanded = this._notification && this._notification.expanded;
         let notificationExpired = this._notificationTimeoutId == 0 &&
                                   !(this._notification && this._notification.urgency == Urgency.CRITICAL) &&
+                                  !(this._notification && this._notification.focused) &&
                                   !this._pointerInTray &&
                                   !this._locked &&
                                   !(this._pointerInKeyboard && notificationExpanded);
-        let notificationLockedOut = this._isScreenLocked && (this._notification && !this._notification.showWhenLocked);
-        // TODO: how to deal with locked out notiifcations if want to keep showing notifications?!
-        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown);
+        let notificationLockedOut = !Main.sessionMode.hasNotifications && this._notification;
+        let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
         let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
 
         if (this._notificationState == State.HIDDEN) {
             if (canShowNotification) {
-                this._showNotification(nextNotification);
-                this._notificationQueue.splice(this._notificationQueue.indexOf(nextNotification), 1);
+                this._showNotification();
             }
         } else if (this._notificationState == State.SHOWN) {
             if (notificationMustClose)
@@ -1947,7 +1985,7 @@ const MessageTray = new Lang.Class({
 
         let summaryOptionalInOverview = this._overviewVisible && !this._locked && !summaryHovered;
         let mustHideSummary = (notificationsPending && (notificationUrgent || summaryOptionalInOverview))
-                              || notificationsVisible || this._isScreenLocked;
+                              || notificationsVisible || !Main.sessionMode.hasNotifications;
 
         if (this._summaryState == State.HIDDEN && !mustHideSummary && summarySummoned)
             this._showSummary();
@@ -1986,9 +2024,22 @@ const MessageTray = new Lang.Class({
         let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
                                    this._summaryState == State.SHOWN);
         if (!trayIsVisible && trayShouldBeVisible)
-            this._showTray();
+            trayShouldBeVisible = this._showTray();
         else if (trayIsVisible && !trayShouldBeVisible)
             this._hideTray();
+
+        // Desktop clone
+        let desktopCloneIsVisible = (this._desktopCloneState == State.SHOWING ||
+                                     this._desktopCloneState == State.SHOWN);
+        let desktopCloneShouldBeVisible = (trayShouldBeVisible &&
+                                           !this._overviewVisible &&
+                                           !this._keyboardVisible);
+
+        if (!desktopCloneIsVisible && desktopCloneShouldBeVisible) {
+            this._showDesktopClone();
+        } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
+            this._hideDesktopClone (this._keyboardVisible);
+        }
     },
 
     _tween: function(actor, statevar, value, params) {
@@ -2017,11 +2068,13 @@ const MessageTray = new Lang.Class({
         // Don't actually take a modal grab in the overview.
         // Just add something to the grab stack that we can
         // pop later.
+        let modal = !this._overviewVisible;
+
         if (!this._grabHelper.grab({ actor: this.actor,
-                                     modal: !this._overviewVisible,
+                                     modal: modal,
                                      onUngrab: Lang.bind(this, this._escapeTray) })) {
             this._traySummoned = false;
-            return;
+            return false;
         }
 
         this._tween(this.actor, '_trayState', State.SHOWN,
@@ -2030,49 +2083,48 @@ const MessageTray = new Lang.Class({
                       transition: 'easeOutQuad'
                     });
 
-        // Don't move the windows up if we are in the overview,
-        // but show the tray in the ctrl+alt+tab list.
-        if (this._overviewVisible) {
-            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
-                                            { sortGroup: CtrlAltTab.SortGroup.BOTTOM });
-            return;
-        }
+        if (!this._overviewVisible)
+            this._lightbox.show();
 
+        return true;
+    },
+
+    _updateDesktopCloneClip: function() {
+        let geometry = this._bottomMonitorGeometry;
+        let progress = -Math.round(this._desktopClone.y);
+        this._desktopClone.set_clip(geometry.x,
+                                    geometry.y + progress,
+                                    geometry.width,
+                                    geometry.height - progress);
+    },
+
+    _showDesktopClone: function() {
         let bottomMonitor = Main.layoutManager.bottomMonitor;
-        let geometry = new Clutter.Geometry({ x: bottomMonitor.x,
-                                              y: bottomMonitor.y,
-                                              width: bottomMonitor.width,
-                                              height: bottomMonitor.height
-                                            });
-        this._desktopClone = new Clutter.Clone({ source: global.window_group, clip: geometry });
+        this._bottomMonitorGeometry = { x: bottomMonitor.x,
+                                        y: bottomMonitor.y,
+                                        width: bottomMonitor.width,
+                                        height: bottomMonitor.height };
+
+        if (this._desktopClone)
+            this._desktopClone.destroy();
+        this._desktopClone = new Clutter.Clone({ source: global.window_group, clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
         Main.uiGroup.insert_child_above(this._desktopClone, global.window_group);
         this._desktopClone.x = 0;
         this._desktopClone.y = 0;
         this._desktopClone.show();
 
-        this._lightbox.show();
-
-        this._desktopClone._progress = 0;
-        Tweener.addTween(this._desktopClone,
-                         { _progress: this.actor.height,
-                           time: ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: Lang.bind(this, function() {
-                               let progress = Math.round(this._desktopClone._progress);
-                               this._desktopClone.y = - progress;
-                               this._desktopClone.set_clip(geometry.x,
-                                                           geometry.y + progress,
-                                                           geometry.width,
-                                                           geometry.height - progress);
-                           })
-                         });
+        this._tween(this._desktopClone, '_desktopCloneState', State.SHOWN,
+                    { y: -this.actor.height,
+                      time: ANIMATION_TIME,
+                      transition: 'easeOutQuad',
+                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
+                    });
     },
 
     _hideTray: function() {
-        // Note that we might have entered here without a grab,
-        // which would happen if GrabHelper ungrabbed for us.
-        // This is a no-op in that case.
-        this._grabHelper.ungrab({ actor: this.actor });
+        // Having the summary item animate out while sliding down the tray
+        // is distracting, so hide it immediately in case it was visible.
+        this._summaryBoxPointer.actor.hide();
 
         this._tween(this.actor, '_trayState', State.HIDDEN,
                     { y: 0,
@@ -2080,36 +2132,27 @@ const MessageTray = new Lang.Class({
                       transition: 'easeOutQuad'
                     });
 
-        // If we are coming back from the overview, there are no windows
-        // to be moved. Just remove the tray from the ctrl+alt+tab list.
-        if (!this._desktopClone) {
-            Main.ctrlAltTabManager.removeGroup(this._summary);
-            return;
-        }
-
-        let geometry = this._desktopClone.clip;
-        this._desktopClone._progress = 0;
-        Tweener.addTween(this._desktopClone,
-                         { _progress: this.actor.height,
-                           time: ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this._desktopClone.destroy();
-                               this._desktopClone = null;
-                           }),
-                           onUpdate: Lang.bind(this, function() {
-                               let progress = Math.round(this._desktopClone._progress);
-                               this._desktopClone.y = progress - this.actor.height;
-                               this._desktopClone.set_clip(geometry.x,
-                                                           geometry.y - progress,
-                                                           geometry.width,
-                                                           geometry.height + progress);
-                           })
-                         });
-
+        // Note that we might have entered here without a grab,
+        // which would happen if GrabHelper ungrabbed for us.
+        // This is a no-op in that case.
+        this._grabHelper.ungrab({ actor: this.actor });
         this._lightbox.hide();
     },
 
+    _hideDesktopClone: function(now) {
+        this._tween(this._desktopClone, '_desktopCloneState', State.HIDDEN,
+                    { y: 0,
+                      time: now ? 0 : ANIMATION_TIME,
+                      transition: 'easeOutQuad',
+                      onComplete: Lang.bind(this, function() {
+                          this._desktopClone.destroy();
+                          this._desktopClone = null;
+                          this._bottomMonitorGeometry = null;
+                      }),
+                      onUpdate: Lang.bind(this, this._updateDesktopCloneClip)
+                    });
+    },
+
     _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
         this.idleMonitor.remove_watch(this._idleMonitorWatchId);
         this._idleMonitorWatchId = 0;
@@ -2119,13 +2162,16 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
-    _showNotification: function(notification) {
-        this._notification = notification;
+    _showNotification: function() {
+        this._notification = this._notificationQueue.shift();
         this._userActiveWhileNotificationShown = this.idleMonitor.get_idletime() <= IDLE_TIME;
         this._idleMonitorWatchId = this.idleMonitor.add_watch(IDLE_TIME,
                                                               Lang.bind(this, this._onIdleMonitorWatch));
         this._notificationClickedId = this._notification.connect('done-displaying',
                                                                  Lang.bind(this, this._escapeTray));
+        this._notification.connect('unfocused', Lang.bind(this, function() {
+            this._updateState();
+        }));
         this._notificationBin.child = this._notification.actor;
 
         this._notificationWidget.opacity = 0;
@@ -2311,18 +2357,16 @@ const MessageTray = new Lang.Class({
     },
 
     _showSummary: function() {
-        this._summaryBin.opacity = 0;
-        this._summaryBin.y = this.actor.height;
-        this._tween(this._summaryBin, '_summaryState', State.SHOWN,
-                    { y: 0,
-                      opacity: 255,
+        this._summary.opacity = 0;
+        this._tween(this._summary, '_summaryState', State.SHOWN,
+                    { opacity: 255,
                       time: ANIMATION_TIME,
                       transition: 'easeOutQuad',
                     });
     },
 
     _hideSummary: function() {
-        this._tween(this._summaryBin, '_summaryState', State.HIDDEN,
+        this._tween(this._summary, '_summaryState', State.HIDDEN,
                     { opacity: 0,
                       time: ANIMATION_TIME,
                       transition: 'easeOutQuad',
@@ -2333,9 +2377,11 @@ const MessageTray = new Lang.Class({
         this._summaryBoxPointerItem = this._clickedSummaryItem;
         this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
                                                                                       Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
-        this._summaryBoxPointerDoneDisplayingId = this._summaryBoxPointerItem.connect('done-displaying-content',
-                                                                                      Lang.bind(this, this._escapeTray));
-        if (this._clickedSummaryItemMouseButton == 1) {
+        this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
+                                                                                  Lang.bind(this, this._escapeTray));
+
+        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
+        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
             let newQueue = [];
             for (let i = 0; i < this._notificationQueue.length; i++) {
                 let notification = this._notificationQueue[i];
@@ -2348,14 +2394,16 @@ const MessageTray = new Lang.Class({
             this._notificationQueue = newQueue;
 
             this._summaryBoxPointer.bin.child = this._summaryBoxPointerItem.notificationStackWidget;
-            this._summaryBoxPointerItem.closeButtonVisible = true;
+
+            let closeButton = this._summaryBoxPointerItem.closeButton;
+            closeButton.show();
+            this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer));
             this._summaryBoxPointerItem.prepareNotificationStackForShowing();
         } else if (this._clickedSummaryItemMouseButton == 3) {
             this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu;
         }
 
         this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-                                untracked: true,
                                 grabFocus: true,
                                 onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
         this._lock();
@@ -2418,6 +2466,21 @@ const MessageTray = new Lang.Class({
         return true;
     },
 
+   _onSummaryBoxPointerKeyPress: function(actor, event) {
+       switch (event.get_key_symbol()) {
+           case Clutter.KEY_Down:
+           case Clutter.KEY_Escape:
+               this._setClickedSummaryItem(null);
+               this._updateState();
+               return true;
+           case Clutter.KEY_Delete:
+               this._clickedSummaryItem.source.destroy();
+               this._escapeTray();
+               return true;
+       }
+       return false;
+   },
+
     _onSummaryBoxPointerUngrabbed: function() {
         this._summaryBoxPointerState = State.HIDING;
         this._unlock();
@@ -2426,19 +2489,14 @@ const MessageTray = new Lang.Class({
             this._summaryBoxPointer.actor.hide();
             this._hideSummaryBoxPointerCompleted();
         } else {
+            if (global.stage.key_focus &&
+                !this.actor.contains(global.stage.key_focus))
+                this._setClickedSummaryItem(null);
             this._summaryBoxPointer.hide(BoxPointer.PopupAnimation.FULL, Lang.bind(this, this._hideSummaryBoxPointerCompleted));
         }
     },
 
     _hideSummaryBoxPointer: function() {
-        // We should be sure to hide the box pointer if all notifications in it are destroyed while
-        // it is hiding, so that we don't show an animation of an empty blob being hidden.
-        if (this._summaryBoxPointerState == State.HIDING &&
-            this._summaryBoxPointerItem.notificationStack.get_n_children() == 0) {
-            this._summaryBoxPointer.actor.hide();
-            return;
-        }
-
         this._grabHelper.ungrab({ actor: this._summaryBoxPointer.bin.child });
     },
 
@@ -2449,7 +2507,9 @@ const MessageTray = new Lang.Class({
         this._summaryBoxPointer.bin.child = null;
         this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId);
         this._summaryBoxPointerContentUpdatedId = 0;
-        this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerDoneDisplayingId);
+        this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId);
+        this._summaryBoxPointerCloseClickedId = 0;
+        this._summaryBoxPointerItem.source.disconnect(this._sourceDoneDisplayingId);
         this._summaryBoxPointerDoneDisplayingId = 0;
 
         let sourceNotificationStackDoneShowing = null;

js/ui/modalDialog.js

@@ -37,12 +37,13 @@ const ModalDialog = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
-                                        parentActor: Main.uiGroup
-                                      });
+                                        parentActor: Main.uiGroup,
+                                        shouldFadeIn: true });
 
         this.state = State.CLOSED;
         this._hasModal = false;
         this._shellReactive = params.shellReactive;
+        this._shouldFadeIn = params.shouldFadeIn;
 
         this._group = new St.Widget({ visible: false,
                                       x: 0,
@@ -130,8 +131,11 @@ const ModalDialog = new Lang.Class({
             let key = buttonInfo['key'];
             let isDefault = buttonInfo['default'];
 
-            if (isDefault && !key)
+            if (isDefault && !key) {
+                this._actionKeys[Clutter.KEY_KP_Enter] = action;
+                this._actionKeys[Clutter.KEY_ISO_Enter] = action;
                 key = Clutter.KEY_Return;
+            }
 
             buttonInfo.button = new St.Button({ style_class: 'modal-dialog-button',
                                                 reactive:    true,
@@ -198,8 +202,11 @@ const ModalDialog = new Lang.Class({
         this.emit('destroy');
     },
 
-    _fadeOpen: function() {
-        this._monitorConstraint.index = global.screen.get_current_monitor();
+    _fadeOpen: function(onPrimary) {
+        if (onPrimary)
+            this._monitorConstraint.primary = true;
+        else
+            this._monitorConstraint.index = global.screen.get_current_monitor();
 
         this.state = State.OPENING;
 
@@ -210,7 +217,7 @@ const ModalDialog = new Lang.Class({
         this._group.show();
         Tweener.addTween(this._group,
                          { opacity: 255,
-                           time: OPEN_AND_CLOSE_TIME,
+                           time: this._shouldFadeIn ? OPEN_AND_CLOSE_TIME : 0,
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this,
                                function() {
@@ -232,14 +239,14 @@ const ModalDialog = new Lang.Class({
         }));
     },
 
-    open: function(timestamp) {
+    open: function(timestamp, onPrimary) {
         if (this.state == State.OPENED || this.state == State.OPENING)
             return true;
 
         if (!this.pushModal(timestamp))
             return false;
 
-        this._fadeOpen();
+        this._fadeOpen(onPrimary);
         return true;
     },
 

js/ui/notificationDaemon.js

@@ -116,8 +116,8 @@ const NotificationDaemon = new Lang.Class({
         this._busProxy = new Bus();
 
         this._trayManager = new Shell.TrayManager();
-        this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
-        this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+        this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
 
         Shell.WindowTracker.get_default().connect('notify::focus-app',
             Lang.bind(this, this._onFocusAppChanged));
@@ -499,7 +499,7 @@ const NotificationDaemon = new Lang.Class({
     },
 
     _onTrayIconAdded: function(o, icon) {
-        let wmClass = icon.wm_class.toLowerCase();
+        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
         if (STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass] !== undefined)
             return;
 

js/ui/overview.js

@@ -71,7 +71,6 @@ const ShellInfo = new Lang.Class({
         if (this._source.notifications.length == 0) {
             notification = new MessageTray.Notification(this._source, text, null);
             notification.setTransient(true);
-            notification.setShowWhenLocked(true);
         } else {
             notification = this._source.notifications[0];
             notification.update(text, null, { clear: true });
@@ -92,16 +91,21 @@ const ShellInfo = new Lang.Class({
 const Overview = new Lang.Class({
     Name: 'Overview',
 
-    _init : function() {
-        this.isDummy = !Main.sessionMode.hasOverview;
+    _init: function() {
+        this._overviewCreated = false;
 
-        // We only have an overview in user sessions, so
-        // create a dummy overview in other cases
-        if (this.isDummy) {
-            this.animationInProgress = false;
-            this.visible = false;
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
+    },
+
+    _createOverview: function() {
+        if (this._overviewCreated)
             return;
-        }
+
+        if (this.isDummy)
+            return;
+
+        this._overviewCreated = true;
 
         // The main BackgroundActor is inside global.window_group which is
         // hidden when displaying the overview, so we create a new
@@ -174,6 +178,11 @@ const Overview = new Lang.Class({
         this._needsFakePointerEvent = false;
     },
 
+    _sessionUpdated: function() {
+        this.isDummy = !Main.sessionMode.hasOverview;
+        this._createOverview();
+    },
+
     // The members we construct that are implemented in JS might
     // want to access the overview as Main.overview to connect
     // signal handlers and so forth. So we create them after
@@ -461,7 +470,9 @@ const Overview = new Lang.Class({
         if (windows.length == 0)
             return null;
 
-        let clone = new Clutter.Clone({ source: windows[0].get_texture() });
+        let window = windows[0];
+        let clone = new Clutter.Clone({ source: window.get_texture(),
+                                        x: window.x, y: window.y });
         clone.source.connect('destroy', Lang.bind(this, function() {
             clone.destroy();
         }));

js/ui/panel.js

@@ -468,15 +468,6 @@ const AppMenuButton = new Lang.Class({
         this._sync();
     },
 
-    setLockedState: function(locked) {
-        if (locked) {
-            this.hide();
-        } else {
-            this.show();
-            this._sync();
-        }
-    },
-
     _sync: function() {
         let tracker = Shell.WindowTracker.get_default();
         let focusedApp = tracker.focus_app;
@@ -610,8 +601,8 @@ const ActivitiesButton = new Lang.Class({
 
         this.actor.label_actor = this._label;
 
-        this._hotCorner = new Layout.HotCorner();
-        container.add_actor(this._hotCorner.actor);
+        this.hotCorner = new Layout.HotCorner();
+        container.add_actor(this.hotCorner.actor);
 
         // Hack up our menu...
         this.menu.open = Lang.bind(this, this._onMenuOpenRequest);
@@ -661,10 +652,10 @@ const ActivitiesButton = new Lang.Class({
         }
 
         hotBox.x1 = Math.round(x);
-        hotBox.x2 = hotBox.x1 + this._hotCorner.actor.width;
+        hotBox.x2 = hotBox.x1 + this.hotCorner.actor.width;
         hotBox.y1 = Math.round(y);
-        hotBox.y2 = hotBox.y1 + this._hotCorner.actor.height;
-        this._hotCorner.actor.allocate(hotBox, flags);
+        hotBox.y2 = hotBox.y1 + this.hotCorner.actor.height;
+        this.hotCorner.actor.allocate(hotBox, flags);
     },
 
     handleDragOver: function(source, actor, x, y, time) {
@@ -686,7 +677,7 @@ const ActivitiesButton = new Lang.Class({
 
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            if (!this._hotCorner.shouldToggleOverviewOnClick())
+            if (!this.hotCorner.shouldToggleOverviewOnClick())
                 return true;
         }
         return false;
@@ -943,8 +934,6 @@ const Panel = new Lang.Class({
             this.actor.remove_style_class_name('in-overview');
         }));
 
-        Main.screenShield.connect('lock-status-changed', Lang.bind(this, this._onLockStateChanged));
-
         this.menuManager = new PopupMenu.PopupMenuManager(this);
 
         this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
@@ -975,6 +964,9 @@ const Panel = new Lang.Class({
         Main.layoutManager.panelBox.add(this.actor);
         Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'start-here-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.TOP });
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._updatePanel));
+        this._updatePanel();
     },
 
     _getPreferredWidth: function(actor, forHeight, alloc) {
@@ -1034,16 +1026,19 @@ const Panel = new Lang.Class({
         }
         this._rightBox.allocate(childBox, flags);
 
-        let [cornerMinWidth, cornerWidth] = this._leftCorner.actor.get_preferred_width(-1);
-        let [cornerMinHeight, cornerHeight] = this._leftCorner.actor.get_preferred_width(-1);
+        let cornerMinWidth, cornerMinHeight;
+        let cornerWidth, cornerHeight;
+
+        [cornerMinWidth, cornerWidth] = this._leftCorner.actor.get_preferred_width(-1);
+        [cornerMinHeight, cornerHeight] = this._leftCorner.actor.get_preferred_height(-1);
         childBox.x1 = 0;
         childBox.x2 = cornerWidth;
         childBox.y1 = allocHeight;
         childBox.y2 = allocHeight + cornerHeight;
         this._leftCorner.actor.allocate(childBox, flags);
 
-        let [cornerMinWidth, cornerWidth] = this._rightCorner.actor.get_preferred_width(-1);
-        let [cornerMinHeight, cornerHeight] = this._rightCorner.actor.get_preferred_width(-1);
+        [cornerMinWidth, cornerWidth] = this._rightCorner.actor.get_preferred_width(-1);
+        [cornerMinHeight, cornerHeight] = this._rightCorner.actor.get_preferred_height(-1);
         childBox.x1 = allocWidth - cornerWidth;
         childBox.x2 = allocWidth;
         childBox.y1 = allocHeight;
@@ -1103,11 +1098,27 @@ const Panel = new Lang.Class({
         menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
-    init: function() {
+    set boxOpacity(value) {
+        let isReactive = value > 0;
+
+        this._leftBox.opacity = value;
+        this._leftBox.reactive = isReactive;
+        this._centerBox.opacity = value;
+        this._centerBox.reactive = isReactive;
+        this._rightBox.opacity = value;
+        this._rightBox.reactive = isReactive;
+    },
+
+    get boxOpacity() {
+        return this._leftBox.opacity;
+    },
+
+    _updatePanel: function() {
         let panel = Main.sessionMode.panel;
-        this._initBox(panel.left, this._leftBox);
-        this._initBox(panel.center, this._centerBox);
-        this._initBox(panel.right, this._rightBox);
+        this._hideIndicators();
+        this._updateBox(panel.left, this._leftBox);
+        this._updateBox(panel.center, this._centerBox);
+        this._updateBox(panel.right, this._rightBox);
     },
 
     _initBox: function(elements, box) {
@@ -1119,20 +1130,63 @@ const Panel = new Lang.Class({
                 // bluetooth or network)
                 continue;
             }
+        }
+    },
 
-            let indicator = new constructor(this);
-            this._addToPanelBox(role, indicator, i, box);
+    _hideIndicators: function() {
+        for (let role in PANEL_ITEM_IMPLEMENTATIONS) {
+            let indicator = this.statusArea[role];
+            if (!indicator)
+                continue;
+            if (indicator.menu)
+                indicator.menu.close();
+            indicator.container.hide();
+        }
+    },
+
+    _ensureIndicator: function(role) {
+        let indicator = this.statusArea[role];
+        if (!indicator) {
+            let constructor = PANEL_ITEM_IMPLEMENTATIONS[role];
+            if (!constructor) {
+                // This icon is not implemented (this is a bug)
+                return null;
+            }
+            indicator = new constructor(this);
+            this.statusArea[role] = indicator;
+        }
+        return indicator;
+    },
+
+    _updateBox: function(elements, box) {
+        let nChildren = box.get_n_children();
+
+        for (let i = 0; i < elements.length; i++) {
+            let role = elements[i];
+            let indicator = this._ensureIndicator(role);
+            if (indicator == null)
+                continue;
+
+            this._addToPanelBox(role, indicator, i + nChildren, box);
         }
     },
 
     _addToPanelBox: function(role, indicator, position, box) {
-        box.insert_child_at_index(indicator.actor, position);
+        let container = indicator.container;
+        container.show();
+
+        let parent = container.get_parent();
+        if (parent)
+            parent.remove_actor(container);
+
+        box.insert_child_at_index(container, position);
         if (indicator.menu)
             this.menuManager.addMenu(indicator.menu);
         this.statusArea[role] = indicator;
         let destroyId = indicator.connect('destroy', Lang.bind(this, function(emitter) {
             delete this.statusArea[role];
             emitter.disconnect(destroyId);
+            container.destroy();
         }));
     },
 
@@ -1150,12 +1204,8 @@ const Panel = new Lang.Class({
             right: this._rightBox
         };
         let boxContainer = boxes[box] || this._rightBox;
+        this.statusArea[role] = indicator;
         this._addToPanelBox(role, indicator, position, boxContainer);
         return indicator;
-    },
-
-    _onLockStateChanged: function(shield, locked) {
-        for (let id in this.statusArea)
-            this.statusArea[id].setLockedState(locked);
-    },
+    }
 });

js/ui/panelMenu.js

@@ -21,6 +21,10 @@ const ButtonBox = new Lang.Class({
         this.actor = new Shell.GenericContainer(params);
         this.actor._delegate = this;
 
+        this.container = new St.Bin({ y_fill: true,
+                                      x_fill: true,
+                                      child: this.actor });
+
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
@@ -115,6 +119,12 @@ const Button = new Lang.Class({
         this.setName(nameText);
     },
 
+    setSensitive: function(sensitive) {
+        this.actor.reactive = sensitive;
+        this.actor.can_focus = sensitive;
+        this.actor.track_hover = sensitive;
+    },
+
     setName: function(text) {
         if (text != null) {
             // This is the easiest way to provide a accessible name to
@@ -146,13 +156,6 @@ const Button = new Lang.Class({
         }
     },
 
-    setLockedState: function(locked) {
-        // default behaviour is to hide completely
-        if (locked)
-            this.menu.close();
-        this.actor.visible = !locked;
-    },
-
     _onButtonPress: function(actor, event) {
         if (!this.menu)
             return;
@@ -211,7 +214,8 @@ const Button = new Lang.Class({
     destroy: function() {
         this.actor._delegate = null;
 
-        this.menu.destroy();
+        if (this.menu)
+            this.menu.destroy();
         this.actor.destroy();
 
         this.emit('destroy');

js/ui/placeDisplay.js

@@ -1,412 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const DND = imports.ui.dnd;
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-const Search = imports.ui.search;
-const Util = imports.misc.util;
-
-/**
- * Represents a place object, which is most normally a bookmark entry,
- * a mount/volume, or a special place like the Home Folder, Computer, and Network.
- *
- * @name: String title
- * @iconFactory: A JavaScript callback which will create an icon texture given a size parameter
- * @launch: A JavaScript callback to launch the entry
- */
-const PlaceInfo = new Lang.Class({
-    Name: 'PlaceInfo',
-
-    _init: function(id, name, iconFactory, launch) {
-        this.id = id;
-        this.name = name;
-        this._lowerName = name.toLowerCase();
-        this.iconFactory = iconFactory;
-        this.launch = launch;
-    },
-
-    matchTerms: function(terms) {
-        let mtype = Search.MatchType.NONE;
-        for (let i = 0; i < terms.length; i++) {
-            let term = terms[i];
-            let idx = this._lowerName.indexOf(term);
-            if (idx == 0) {
-                mtype = Search.MatchType.PREFIX;
-            } else if (idx > 0) {
-                if (mtype == Search.MatchType.NONE)
-                    mtype = Search.MatchType.SUBSTRING;
-            } else {
-                return Search.MatchType.NONE;
-            }
-        }
-        return mtype;
-    },
-
-    isRemovable: function() {
-        return false;
-    }
-});
-
-// Helper function to translate launch parameters into a GAppLaunchContext
-function _makeLaunchContext(params)
-{
-    params = Params.parse(params, { workspace: -1,
-                                    timestamp: 0 });
-
-    let launchContext = global.create_app_launch_context();
-    if (params.workspace != -1)
-        launchContext.set_desktop(params.workspace);
-    if (params.timestamp != 0)
-        launchContext.set_timestamp(params.timestamp);
-
-    return launchContext;
-}
-
-const PlaceDeviceInfo = new Lang.Class({
-    Name: 'PlaceDeviceInfo',
-    Extends: PlaceInfo,
-
-    _init: function(mount) {
-        this._mount = mount;
-        this.name = mount.get_name();
-        this._lowerName = this.name.toLowerCase();
-        this.id = 'mount:' + mount.get_root().get_uri();
-    },
-
-    iconFactory: function(size) {
-        let icon = this._mount.get_icon();
-        return St.TextureCache.get_default().load_gicon(null, icon, size);
-    },
-
-    launch: function(params) {
-        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            _makeLaunchContext(params));
-    },
-
-    isRemovable: function() {
-        return this._mount.can_unmount();
-    },
-
-    remove: function() {
-        if (!this.isRemovable())
-            return;
-
-        if (this._mount.can_eject())
-            this._mount.eject(0, null, Lang.bind(this, this._removeFinish));
-        else
-            this._mount.unmount(0, null, Lang.bind(this, this._removeFinish));
-    },
-
-    _removeFinish: function(o, res, data) {
-        try {
-            if (this._mount.can_eject())
-                this._mount.eject_finish(res);
-            else
-                this._mount.unmount_finish(res);
-        } catch (e) {
-            let message = _("Failed to unmount '%s'").format(o.get_name());
-            Main.overview.setMessage(message,
-                                     Lang.bind(this, this.remove),
-                                     _("Retry"));
-        }
-    }
-});
-
-const PlacesManager = new Lang.Class({
-    Name: 'PlacesManager',
-
-    _init: function() {
-        this._defaultPlaces = [];
-        this._mounts = [];
-        this._bookmarks = [];
-
-        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
-        let homeUri = homeFile.get_uri();
-        let homeLabel = Shell.util_get_label_for_uri (homeUri);
-        let homeIcon = Shell.util_get_icon_for_uri (homeUri);
-        this._home = new PlaceInfo('special:home', homeLabel,
-            function(size) {
-                return St.TextureCache.get_default().load_gicon(null, homeIcon, size);
-            },
-            function(params) {
-                Gio.app_info_launch_default_for_uri(homeUri, _makeLaunchContext(params));
-            });
-
-        let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
-        let desktopFile = Gio.file_new_for_path (desktopPath);
-        let desktopUri = desktopFile.get_uri();
-        let desktopLabel = Shell.util_get_label_for_uri (desktopUri);
-        let desktopIcon = Shell.util_get_icon_for_uri (desktopUri);
-        this._desktopMenu = new PlaceInfo('special:desktop', desktopLabel,
-            function(size) {
-                return St.TextureCache.get_default().load_gicon(null, desktopIcon, size);
-            },
-            function(params) {
-                Gio.app_info_launch_default_for_uri(desktopUri, _makeLaunchContext(params));
-            });
-
-        this._defaultPlaces.push(this._home);
-        this._defaultPlaces.push(this._desktopMenu);
-
-        /*
-        * Show devices, code more or less ported from nautilus-places-sidebar.c
-        */
-        this._volumeMonitor = Gio.VolumeMonitor.get();
-        this._volumeMonitor.connect('volume-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-removed',Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
-        this._updateDevices();
-
-        this._bookmarksPath = GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']);
-        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
-        this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-        this._bookmarkTimeoutId = 0;
-        this._monitor.connect('changed', Lang.bind(this, function () {
-            if (this._bookmarkTimeoutId > 0)
-                return;
-            /* Defensive event compression */
-            this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
-                this._bookmarkTimeoutId = 0;
-                this._reloadBookmarks();
-                return false;
-            }));
-        }));
-
-        this._reloadBookmarks();
-    },
-
-    _updateDevices: function() {
-        this._mounts = [];
-
-        /* first go through all connected drives */
-        let drives = this._volumeMonitor.get_connected_drives();
-        for (let i = 0; i < drives.length; i++) {
-            let volumes = drives[i].get_volumes();
-            for(let j = 0; j < volumes.length; j++) {
-                let mount = volumes[j].get_mount();
-                if(mount != null) {
-                    this._addMount(mount);
-                }
-            }
-        }
-
-        /* add all volumes that is not associated with a drive */
-        let volumes = this._volumeMonitor.get_volumes();
-        for(let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
-                continue;
-
-            let mount = volumes[i].get_mount();
-            if(mount != null) {
-                this._addMount(mount);
-            }
-        }
-
-        /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
-        let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
-                continue;
-
-            if(mounts[i].get_volume())
-                continue;
-
-            this._addMount(mounts[i]);
-        }
-
-        /* We emit two signals, one for a generic 'all places' update
-         * and the other for one specific to mounts. We do this because
-         * clients like PlaceDisplay may only care about places in general
-         * being updated while clients like DashPlaceDisplay care which
-         * specific type of place got updated.
-         */
-        this.emit('mounts-updated');
-        this.emit('places-updated');
-
-    },
-
-    _reloadBookmarks: function() {
-
-        this._bookmarks = [];
-
-        if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
-            return;
-
-        let bookmarksContent = Shell.get_file_contents_utf8_sync(this._bookmarksPath);
-
-        let bookmarks = bookmarksContent.split('\n');
-
-        let bookmarksToLabel = {};
-        let bookmarksOrder = [];
-        for (let i = 0; i < bookmarks.length; i++) {
-            let bookmarkLine = bookmarks[i];
-            let components = bookmarkLine.split(' ');
-            let bookmark = components[0];
-            if (bookmark in bookmarksToLabel)
-                continue;
-            let label = null;
-            if (components.length > 1)
-                label = components.slice(1).join(' ');
-            bookmarksToLabel[bookmark] = label;
-            bookmarksOrder.push(bookmark);
-        }
-
-        for (let i = 0; i < bookmarksOrder.length; i++) {
-            let bookmark = bookmarksOrder[i];
-            let label = bookmarksToLabel[bookmark];
-            let file = Gio.file_new_for_uri(bookmark);
-            if (!file.query_exists(null))
-                continue;
-            if (label == null)
-                label = Shell.util_get_label_for_uri(bookmark);
-            if (label == null)
-                continue;
-            let icon = Shell.util_get_icon_for_uri(bookmark);
-
-            let item = new PlaceInfo('bookmark:' + bookmark, label,
-                function(size) {
-                    return St.TextureCache.get_default().load_gicon(null, icon, size);
-                },
-                function(params) {
-                    Gio.app_info_launch_default_for_uri(bookmark, _makeLaunchContext(params));
-                });
-            this._bookmarks.push(item);
-        }
-
-        /* See comment in _updateDevices for explanation why there are two signals. */
-        this.emit('bookmarks-updated');
-        this.emit('places-updated');
-    },
-
-    _addMount: function(mount) {
-        let devItem = new PlaceDeviceInfo(mount);
-        this._mounts.push(devItem);
-    },
-
-    getAllPlaces: function () {
-        return this.getDefaultPlaces().concat(this.getBookmarks(), this.getMounts());
-    },
-
-    getDefaultPlaces: function () {
-        return this._defaultPlaces;
-    },
-
-    getBookmarks: function () {
-        return this._bookmarks;
-    },
-
-    getMounts: function () {
-        return this._mounts;
-    },
-
-    _lookupIndexById: function(sourceArray, id) {
-        for (let i = 0; i < sourceArray.length; i++) {
-            let place = sourceArray[i];
-            if (place.id == id)
-                return i;
-        }
-        return -1;
-    },
-
-    lookupPlaceById: function(id) {
-        let colonIdx = id.indexOf(':');
-        let type = id.substring(0, colonIdx);
-        let sourceArray = null;
-        if (type == 'special')
-            sourceArray = this._defaultPlaces;
-        else if (type == 'mount')
-            sourceArray = this._mounts;
-        else if (type == 'bookmark')
-            sourceArray = this._bookmarks;
-        return sourceArray[this._lookupIndexById(sourceArray, id)];
-    },
-
-    _removeById: function(sourceArray, id) {
-        sourceArray.splice(this._lookupIndexById(sourceArray, id), 1);
-    }
-});
-Signals.addSignalMethods(PlacesManager.prototype);
-
-const PlaceSearchProvider = new Lang.Class({
-    Name: 'PlaceSearchProvider',
-    Extends: Search.SearchProvider,
-
-    _init: function() {
-        this.parent(_("PLACES & DEVICES"));
-        this.placesManager = new PlacesManager();
-    },
-
-    getResultMetas: function(resultIds, callback) {
-        let metas = [];
-        for (let i = 0; i < resultIds.length; i++) {
-            let placeInfo = this.placesManager.lookupPlaceById(resultIds[i]);
-            if (!placeInfo)
-                metas.push(null);
-            else
-                metas.push({ 'id': resultIds[i],
-                             'name': placeInfo.name,
-                             'createIcon': function(size) {
-                                 return placeInfo.iconFactory(size);
-                             }
-                           });
-        }
-        callback(metas);
-    },
-
-    activateResult: function(id, params) {
-        let placeInfo = this.placesManager.lookupPlaceById(id);
-        placeInfo.launch(params);
-    },
-
-    _compareResultMeta: function (idA, idB) {
-        let infoA = this.placesManager.lookupPlaceById(idA);
-        let infoB = this.placesManager.lookupPlaceById(idB);
-        return infoA.name.localeCompare(infoB.name);
-    },
-
-    _searchPlaces: function(places, terms) {
-        let prefixResults = [];
-        let substringResults = [];
-
-        terms = terms.map(String.toLowerCase);
-
-        for (let i = 0; i < places.length; i++) {
-            let place = places[i];
-            let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.PREFIX)
-                prefixResults.push(place.id);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringResults.push(place.id);
-        }
-        prefixResults.sort(Lang.bind(this, this._compareResultMeta));
-        substringResults.sort(Lang.bind(this, this._compareResultMeta));
-
-        this.searchSystem.pushResults(this, prefixResults.concat(substringResults));
-    },
-
-    getInitialResultSet: function(terms) {
-        let places = this.placesManager.getAllPlaces();
-        this._searchPlaces(places, terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(Lang.bind(this, function(id) {
-            return this.placesManager.lookupPlaceById(id);
-        }));
-        this._searchPlaces(places, terms);
-    }
-});

js/ui/popupMenu.js

@@ -61,6 +61,9 @@ const PopupBaseMenuItem = new Lang.Class({
 
         this.setSensitive(this.sensitive);
 
+        if (!this._activatable)
+            this.actor.add_style_class_name('popup-inactive-menu-item');
+
         if (params.style_class)
             this.actor.add_style_class_name(params.style_class);
 
@@ -763,7 +766,7 @@ const PopupSwitchMenuItem = new Lang.Class({
                       { expand: true, span: -1, align: St.Align.END });
 
         this._statusLabel = new St.Label({ text: '',
-                                           style_class: 'popup-inactive-menu-item'
+                                           style_class: 'popup-status-menu-item'
                                          });
         this._statusBin.child = this._switch.actor;
     },
@@ -870,6 +873,12 @@ const PopupMenuBase = new Lang.Class({
         this._activeMenuItem = null;
         this._childMenus = [];
         this._settingsActions = { };
+
+        this._sessionUpdatedId = Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+    },
+
+    _sessionUpdated: function() {
+        this._setSettingsVisibility(Main.sessionMode.allowSettings);
     },
 
     addAction: function(title, callback) {
@@ -883,9 +892,6 @@ const PopupMenuBase = new Lang.Class({
     },
 
     addSettingsAction: function(title, desktopFile) {
-        if (!Main.sessionMode.allowSettings)
-            return null;
-
         let menuItem = this.addAction(title, function() {
                            let app = Shell.AppSystem.get_default().lookup_setting(desktopFile);
 
@@ -898,12 +904,13 @@ const PopupMenuBase = new Lang.Class({
                            app.activate();
                        });
 
+        menuItem.actor.visible = Main.sessionMode.allowSettings;
         this._settingsActions[desktopFile] = menuItem;
 
         return menuItem;
     },
 
-    setSettingsVisibility: function(visible) {
+    _setSettingsVisibility: function(visible) {
         for (let id in this._settingsActions) {
             let item = this._settingsActions[id];
             item.actor.visible = visible;
@@ -1097,7 +1104,8 @@ const PopupMenuBase = new Lang.Class({
         let columnWidths = [];
         let items = this.box.get_children();
         for (let i = 0; i < items.length; i++) {
-            if (!items[i].visible)
+            if (!items[i].visible &&
+                !(items[i]._delegate instanceof PopupSubMenu && items[i-1].visible))
                 continue;
             if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) {
                 let itemColumnWidths = items[i]._delegate.getColumnWidths();
@@ -1172,6 +1180,9 @@ const PopupMenuBase = new Lang.Class({
         this.actor.destroy();
 
         this.emit('destroy');
+
+        Main.sessionMode.disconnect(this._sessionUpdatedId);
+        this._sessionUpdatedId = 0;
     }
 });
 Signals.addSignalMethods(PopupMenuBase.prototype);
@@ -1258,13 +1269,14 @@ const PopupMenu = new Lang.Class({
     },
 
     close: function(animate) {
-        if (!this.isOpen)
-            return;
-
         if (this._activeMenuItem)
             this._activeMenuItem.setActive(false);
 
-        this._boxPointer.hide(animate);
+        if (this._boxPointer.actor.visible)
+            this._boxPointer.hide(animate);
+
+        if (!this.isOpen)
+            return;
 
         this.isOpen = false;
         this.emit('open-state-changed', false);
@@ -1337,6 +1349,11 @@ const PopupSubMenu = new Lang.Class({
         this.actor.vscrollbar_policy =
             needsScrollbar ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
 
+        if (needsScrollbar)
+            this.actor.add_style_pseudo_class('scrolled');
+        else
+            this.actor.remove_style_pseudo_class('scrolled');
+
         // It looks funny if we animate with a scrollbar (at what point is
         // the scrollbar added?) so just skip that case
         if (animate && needsScrollbar)
@@ -2041,6 +2058,9 @@ const PopupMenuManager = new Lang.Class({
     },
 
     addMenu: function(menu, position) {
+        if (this._findMenu(menu) > -1)
+            return;
+
         let menudata = {
             menu:              menu,
             openStateChangeId: menu.connect('open-state-changed', Lang.bind(this, this._onMenuOpenState)),

js/ui/runDialog.js

@@ -219,7 +219,9 @@ const RunDialog = new Lang.Class({
 
         this.contentLayout.add(this._errorBox, { expand: true });
 
-        let errorIcon = new St.Icon({ icon_name: 'dialog-error', icon_size: 24, style_class: 'run-dialog-error-icon' });
+        let errorIcon = new St.Icon({ icon_name: 'dialog-error-symbolic',
+                                      icon_size: 24,
+                                      style_class: 'run-dialog-error-icon' });
 
         this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
 

js/ui/screenShield.js

@@ -9,6 +9,7 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const TweenerEquations = imports.tweener.equations;
 
@@ -17,16 +18,19 @@ const Layout = imports.ui.layout;
 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 Tweener = imports.ui.tweener;
+const Util = imports.misc.util;
 
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
 
-const CURTAIN_SLIDE_TIME = 0.5;
+const CURTAIN_SLIDE_TIME = 0.3;
 // fraction of screen height the arrow must reach before completing
 // the slide up automatically
-const ARROW_DRAG_TRESHOLD = 0.1;
+const ARROW_DRAG_THRESHOLD = 0.1;
 
 // Parameters for the arrow animation
 const N_ARROWS = 3;
@@ -44,7 +48,7 @@ const SUMMARY_ICON_SIZE = 48;
 // STANDARD_FADE_TIME is used when the session goes idle, while
 // SHORT_FADE_TIME is used when requesting lock explicitly from the user menu
 const STANDARD_FADE_TIME = 10;
-const SHORT_FADE_TIME = 0.8;
+const SHORT_FADE_TIME = 0.3;
 
 const Clock = new Lang.Class({
     Name: 'ScreenShieldClock',
@@ -93,13 +97,13 @@ const NotificationsBox = new Lang.Class({
 
         this._residentNotificationBox = new St.BoxLayout({ vertical: true,
                                                            style_class: 'screen-shield-notifications-box' });
-        let scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.MIDDLE });
+        let scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START });
         this._persistentNotificationBox = new St.BoxLayout({ vertical: true,
                                                              style_class: 'screen-shield-notifications-box' });
         scrollView.add_actor(this._persistentNotificationBox);
 
         this.actor.add(this._residentNotificationBox, { x_fill: true });
-        this.actor.add(scrollView, { x_fill: true, x_align: St.Align.MIDDLE });
+        this.actor.add(scrollView, { x_fill: true, x_align: St.Align.START });
 
         this._items = [];
         Main.messageTray.getSummaryItems().forEach(Lang.bind(this, function(item) {
@@ -124,13 +128,12 @@ const NotificationsBox = new Lang.Class({
     },
 
     _updateVisibility: function() {
-        if (this._residentNotificationBox.get_n_children() > 0) {
-            this.actor.show();
-            return;
-        }
+        this._residentNotificationBox.visible = this._residentNotificationBox.get_n_children() > 0;
+        this._persistentNotificationBox.visible = this._persistentNotificationBox.get_children().some(function(a) {
+            return a.visible;
+        });
 
-        let children = this._persistentNotificationBox.get_children();
-        this.actor.visible = children.some(function(a) { return a.visible; });
+        this.actor.visible = this._residentNotificationBox.visible || this._persistentNotificationBox.visible;
     },
 
     _sourceIsResident: function(source) {
@@ -151,7 +154,7 @@ const NotificationsBox = new Lang.Class({
         box.add(sourceActor.actor, { y_fill: true });
 
         let textBox = new St.BoxLayout({ vertical: true });
-        box.add(textBox);
+        box.add(textBox, { y_fill: false, y_align: St.Align.START });
 
         let label = new St.Label({ text: source.title,
                                    style_class: 'screen-shield-notification-label' });
@@ -184,11 +187,11 @@ const NotificationsBox = new Lang.Class({
 
         if (obj.resident) {
             this._residentNotificationBox.add(item.notificationStackWidget);
-            item.closeButtonVisible = false;
+            item.closeButton.hide();
             item.prepareNotificationStackForShowing();
         } else {
             [obj.sourceBox, obj.countLabel] = this._makeNotificationSource(item.source);
-            this._persistentNotificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.MIDDLE });
+            this._persistentNotificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });
         }
 
         obj.contentUpdatedId = item.connect('content-updated', Lang.bind(this, this._onItemContentUpdated));
@@ -234,7 +237,7 @@ const NotificationsBox = new Lang.Class({
             this._residentNotificationBox.remove_actor(obj.item.notificationStackWidget);
 
             [obj.sourceBox, obj.countLabel] = this._makeNotificationSource(obj.source);
-            this._persistentNotificationBox.add(obj.sourceBox);
+            this._persistentNotificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });
         } else if (itemShouldBeResident && !obj.resident) {
             // make into a resident item
             obj.sourceBox.destroy();
@@ -242,7 +245,7 @@ const NotificationsBox = new Lang.Class({
             obj.resident = true;
 
             this._residentNotificationBox.add(obj.item.notificationStackWidget);
-            obj.item.closeButtonVisible = false;
+            obj.item.closeButton.hide();
             obj.item.prepareNotificationStackForShowing();
         } else {
             // just update the counter
@@ -365,7 +368,8 @@ const ScreenShield = new Lang.Class({
                                                    name: 'lockScreenContents' });
         this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));
 
-        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
+        this._background = new St.Bin({ style_class: 'screen-shield-background',
+                                        child: Meta.BackgroundActor.new_for_screen(global.screen) });
         this._lockScreenGroup.add_actor(this._background);
         this._lockScreenGroup.add_actor(this._lockScreenContents);
 
@@ -395,6 +399,7 @@ const ScreenShield = new Lang.Class({
 
         this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                 y_expand: true,
+                                                pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
                                                 name: 'lockDialogGroup' });
 
         this.actor.add_actor(this._lockDialogGroup);
@@ -412,6 +417,8 @@ const ScreenShield = new Lang.Class({
             this._onStatusChanged(status);
         }));
 
+        this._screenSaverDBus = new ShellDBus.ScreenSaverDBus(this);
+
         this._loginManager = LoginManager.getLoginManager();
         this._loginSession = this._loginManager.getCurrentSessionProxy();
         this._loginSession.connectSignal('Lock', Lang.bind(this, function() { this.lock(false); }));
@@ -420,27 +427,43 @@ const ScreenShield = new Lang.Class({
         this._settings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
 
         this._isModal = false;
-        this._isLocked = false;
         this._hasLockScreen = false;
+        this._isGreeter = false;
+        this._isActive = false;
+        this._inUnlockAnimation = false;
+        this._activationTime = 0;
 
         this._lightbox = new Lightbox.Lightbox(Main.uiGroup,
                                                { inhibitEvents: true,
                                                  fadeInTime: STANDARD_FADE_TIME,
                                                  fadeFactor: 1 });
+
+        this.idleMonitor = Shell.IdleMonitor.get();
     },
 
     _onLockScreenKeyRelease: function(actor, event) {
-        if (event.get_key_symbol() == Clutter.KEY_Escape) {
-            this._ensureUnlockDialog();
+        let symbol = event.get_key_symbol();
+
+        // Do nothing if the lock screen is not fully shown.
+        // This avoids reusing the previous (and stale) unlock
+        // dialog if esc is pressed while the curtain is going
+        // down after cancel.
+        // Similarly, don't bump if the lock screen is not showing or is
+        // animating, as the bump overrides the animation and would
+        // remove any onComplete handler.
+
+        if (this._lockScreenState != MessageTray.State.SHOWN)
+            return false;
+
+        if (symbol == Clutter.KEY_Escape ||
+            symbol == Clutter.KEY_Return ||
+            symbol == Clutter.KEY_KP_Enter) {
+            this._ensureUnlockDialog(true);
             this._hideLockScreen(true);
             return true;
         }
 
-        // Don't bump if the lock screen is not showing or is
-        // animating, as the bump overrides the animation and would
-        // remove any onComplete handler
-        if (this._lockScreenState == MessageTray.State.SHOWN)
-            this._bumpLockScreen();
+        this._bumpLockScreen();
         return true;
     },
 
@@ -458,8 +481,8 @@ const ScreenShield = new Lang.Class({
 
         // 7 standard scrolls to lift up
         if (this._lockScreenScrollCounter > 35) {
-            this._ensureUnlockDialog();
-            this._hideLockScreen(0);
+            this._ensureUnlockDialog(false);
+            this._hideLockScreen(true);
         }
 
         return true;
@@ -490,11 +513,11 @@ const ScreenShield = new Lang.Class({
     _onDragBegin: function() {
         Tweener.removeTweens(this._lockScreenGroup);
         this._lockScreenState = MessageTray.State.HIDING;
-        this._ensureUnlockDialog();
+        this._ensureUnlockDialog(false);
     },
 
     _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
-        if (this._lockScreenGroup.y < -(ARROW_DRAG_TRESHOLD * global.stage.height)) {
+        if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
             this._hideLockScreen(true);
         } else {
@@ -506,7 +529,7 @@ const ScreenShield = new Lang.Class({
             Tweener.addTween(this._lockScreenGroup,
                              { y: 0,
                                time: time,
-                               transition: 'linear',
+                               transition: 'easeInQuad',
                                onComplete: function() {
                                    this._lockScreenGroup.fixed_position_set = false;
                                    this._lockScreenState = MessageTray.State.SHOWN;
@@ -517,7 +540,7 @@ const ScreenShield = new Lang.Class({
             // If we have a unlock dialog, cancel it
             if (this._dialog) {
                 this._dialog.cancel();
-                if (!this._keepDialog) {
+                if (!this._isGreeter) {
                     this._dialog = null;
                 }
             }
@@ -525,37 +548,67 @@ const ScreenShield = new Lang.Class({
     },
 
     _onStatusChanged: function(status) {
-        if (status == GnomeSession.PresenceStatus.IDLE) {
-            if (this._dialog) {
-                this._dialog.cancel();
-                if (!this._keepDialog) {
-                    this._dialog = null;
-                }
-            }
+        if (status != GnomeSession.PresenceStatus.IDLE)
+            return;
 
+        if (this._dialog) {
+            this._dialog.cancel();
+            if (!this._isGreeter) {
+                this._dialog = null;
+            }
+        }
+
+        if (!this._isModal) {
+            Main.pushModal(this.actor);
+            this._isModal = true;
+        }
+
+        if (!this._isActive) {
+            this._lightbox.show();
+
+            if (this._activationTime == 0)
+                this._activationTime = GLib.get_monotonic_time();
+
+            // What we want is a negative transition to 0, so we install a watch for
+            // 1 second and trigger it if the idle_time becomes lower than that
+            // The correct fix will come in GNOME 3.8 with GnomeDesktop.IdleMonitor
+            this._becameActiveId = this.idleMonitor.add_watch(1000, Lang.bind(this, function() {
+                if (this.idleMonitor.get_idletime() >= 1000)
+                    return;
+
+                this.idleMonitor.remove_watch(this._becameActiveId);
+
+                let lightboxWasShown = this._lightbox.shown;
+                this._lightbox.hide();
+
+                let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
+                if (shouldLock || this._isLocked) {
+                    this.lock(false);
+                } else if (this._isActive) {
+                    this.unlock();
+                }
+            }));
+
+            this._isActive = true;
+            this.emit('lock-status-changed');
+        }
+    },
+
+    showDialog: function() {
+        // Ensure that the stage window is mapped, before taking a grab
+        // otherwise X errors out
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
             if (!this._isModal) {
                 Main.pushModal(this.actor);
                 this._isModal = true;
             }
 
-            if (!this._isLocked)
-                this._lightbox.show();
-        } else {
-            let lightboxWasShown = this._lightbox.shown;
-            this._lightbox.hide();
+            return false;
+        }));
 
-            let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
-            if (shouldLock || this._isLocked) {
-                this.lock(false);
-            } else if (this._isModal) {
-                this.unlock();
-            }
-        }
-    },
-
-    showDialog: function() {
-        this.lock(true);
-        this._ensureUnlockDialog();
+        this.actor.show();
+        this._isGreeter = Main.sessionMode.isGreeter;
+        this._ensureUnlockDialog(true);
         this._hideLockScreen(false);
     },
 
@@ -586,33 +639,37 @@ const ScreenShield = new Lang.Class({
             Tweener.addTween(this._lockScreenGroup,
                              { y: -h,
                                time: time,
-                               transition: 'linear',
+                               transition: 'easeInQuad',
                                onComplete: function() {
-                                   this._lockScreenHidden();
+                                   this._lockScreenState = MessageTray.State.HIDDEN;
+                                   this._lockScreenGroup.hide();
                                },
                                onCompleteScope: this,
                              });
         } else {
-            this._lockScreenHidden();
+            this._lockScreenState = MessageTray.State.HIDDEN;
+            this._lockScreenGroup.hide();
         }
+
+        if (Main.sessionMode.currentMode == 'lock-screen')
+            Main.sessionMode.popMode('lock-screen');
     },
 
-    _lockScreenHidden: function() {
-        this._lockScreenState = MessageTray.State.HIDDEN;
-        this._lockScreenGroup.hide();
-    },
-
-    _ensureUnlockDialog: function() {
+    _ensureUnlockDialog: function(onPrimary) {
         if (!this._dialog) {
-            [this._dialog, this._keepDialog] = Main.sessionMode.createUnlockDialog(this._lockDialogGroup);
-            if (!this._dialog) {
+            let constructor = Main.sessionMode.unlockDialog;
+            if (!constructor) {
                 // This session mode has no locking capabilities
                 this.unlock();
                 return;
             }
 
+            this._dialog = new constructor(this._lockDialogGroup);
+
+
+            let time = global.get_current_time();
             this._dialog.connect('loaded', Lang.bind(this, function() {
-                if (!this._dialog.open()) {
+                if (!this._dialog.open(time, onPrimary)) {
                     log('Could not open login dialog: failed to acquire grab');
                     this.unlock();
                 }
@@ -621,45 +678,42 @@ const ScreenShield = new Lang.Class({
             this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
             this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
         }
-
-        if (this._keepDialog) {
-            // Notify the other components that even though we are showing the
-            // screenshield, we're not in a locked state
-            // (this happens for the gdm greeter)
-
-            this._isLocked = false;
-            this.emit('lock-status-changed', false);
-        }
     },
 
     _onUnlockFailed: function() {
-        this._dialog.destroy();
-        this._dialog = null;
-
-        this._resetLockScreen(false);
+        this._resetLockScreen(true, false);
     },
 
     _onUnlockSucceded: function() {
-        this.unlock();
+        this._tweenUnlocked();
     },
 
-    _resetLockScreen: function(animate) {
+    _resetLockScreen: function(animateLockScreen, animateLockDialog) {
+        this._ensureLockScreen();
+        this._lockDialogGroup.scale_x = 1;
+        this._lockDialogGroup.scale_y = 1;
+
         this._lockScreenGroup.show();
         this._lockScreenState = MessageTray.State.SHOWING;
 
-        if (animate) {
+        if (animateLockScreen) {
             this._lockScreenGroup.y = -global.screen_height;
             Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
                              { y: 0,
                                time: SHORT_FADE_TIME,
-                               transition: 'linear',
+                               transition: 'easeOutQuad',
                                onComplete: function() {
                                    this._lockScreenShown();
                                },
                                onCompleteScope: this
                              });
+        } else {
+            this._lockScreenGroup.fixed_position_set = false;
+            this._lockScreenShown();
+        }
 
+        if (animateLockDialog) {
             this._lockDialogGroup.opacity = 0;
             Tweener.removeTweens(this._lockDialogGroup);
             Tweener.addTween(this._lockDialogGroup,
@@ -668,13 +722,20 @@ const ScreenShield = new Lang.Class({
                                transition: 'easeOutQuad' });
         } else {
             this._lockDialogGroup.opacity = 255;
-            this._lockScreenShown();
         }
 
         this._lockScreenGroup.grab_key_focus();
+
+        if (Main.sessionMode.currentMode != 'lock-screen')
+            Main.sessionMode.pushMode('lock-screen');
     },
 
     _lockScreenShown: function() {
+        if (this._dialog && !this._isGreeter) {
+            this._dialog.destroy();
+            this._dialog = null;
+        }
+
         if (this._arrowAnimationId)
             Mainloop.source_remove(this._arrowAnimationId);
         this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
@@ -689,12 +750,16 @@ const ScreenShield = new Lang.Class({
 
     // Some of the actors in the lock screen are heavy in
     // resources, so we only create them when needed
-    _prepareLockScreen: function() {
+    _ensureLockScreen: function() {
+        if (this._hasLockScreen)
+            return;
+
         this._lockScreenContentsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.CENTER,
                                                          y_align: Clutter.ActorAlign.CENTER,
                                                          x_expand: true,
                                                          y_expand: true,
-                                                         vertical: true });
+                                                         vertical: true,
+                                                         style_class: 'screen-shield-contents-box' });
         this._clock = new Clock();
         this._lockScreenContentsBox.add(this._clock.actor, { x_fill: true,
                                                              y_fill: true });
@@ -731,22 +796,38 @@ const ScreenShield = new Lang.Class({
     },
 
     get locked() {
-        return this._isLocked;
+        return this._isActive;
+    },
+
+    get activationTime() {
+        return this._activationTime;
+    },
+
+    _tweenUnlocked: function() {
+        this._inUnlockAnimation = true;
+        this.unlock();
+        Tweener.addTween(this._lockDialogGroup, {
+            scale_x: 0,
+            scale_y: 0,
+            time: Overview.ANIMATION_TIME,
+            transition: 'easeOutQuad',
+            onComplete: function() {
+                if (this._dialog) {
+                    this._dialog.destroy();
+                    this._dialog = null;
+                }
+                this.actor.hide();
+                this._inUnlockAnimation = false;
+            },
+            onCompleteScope: this
+        });
     },
 
     unlock: function() {
         if (this._hasLockScreen)
             this._clearLockScreen();
 
-        if (this._keepDialog) {
-            // The dialog must be kept alive,
-            // so immediately go back to it
-            // This will also reset _isLocked
-            this._ensureUnlockDialog();
-            return;
-        }
-
-        if (this._dialog) {
+        if (this._dialog && !this._isGreeter) {
             this._dialog.destroy();
             this._dialog = null;
         }
@@ -758,26 +839,102 @@ const ScreenShield = new Lang.Class({
             this._isModal = false;
         }
 
-        this._isLocked = false;
-        this.actor.hide();
+        if (!this._inUnlockAnimation)
+            this.actor.hide();
 
-        this.emit('lock-status-changed', false);
+        if (Main.sessionMode.currentMode == 'lock-screen')
+            Main.sessionMode.popMode('lock-screen');
+        if (Main.sessionMode.currentMode == 'unlock-dialog')
+            Main.sessionMode.popMode('unlock-dialog');
+
+        this._activationTime = 0;
+        this._isActive = false;
+        this._isLocked = false;
+        this.emit('lock-status-changed');
     },
 
     lock: function(animate) {
-        if (!this._hasLockScreen)
-            this._prepareLockScreen();
-
         if (!this._isModal) {
             Main.pushModal(this.actor);
             this._isModal = true;
         }
 
-        this._isLocked = true;
-        this.actor.show();
-        this._resetLockScreen(animate);
+        if (this._activationTime == 0)
+            this._activationTime = GLib.get_monotonic_time();
 
-        this.emit('lock-status-changed', true);
+        this.actor.show();
+
+        if (Main.sessionMode.currentMode != 'unlock-dialog' &&
+            Main.sessionMode.currentMode != 'lock-screen') {
+            this._isGreeter = Main.sessionMode.isGreeter;
+            if (!this._isGreeter)
+                Main.sessionMode.pushMode('unlock-dialog');
+        }
+
+        this._resetLockScreen(animate, animate);
+
+        this._isActive = true;
+        this._isLocked = true;
+        this.emit('lock-status-changed');
     },
 });
 Signals.addSignalMethods(ScreenShield.prototype);
+
+/* Fallback code to handle session locking using gnome-screensaver,
+   in case the required GDM dependency is not there
+*/
+const ScreenShieldFallback = new Lang.Class({
+    Name: 'ScreenShieldFallback',
+
+    _init: function() {
+        Util.spawn(['gnome-screensaver']);
+
+        this._proxy = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+                                          g_name: 'org.gnome.ScreenSaver',
+                                          g_object_path: '/org/gnome/ScreenSaver',
+                                          g_interface_name: 'org.gnome.ScreenSaver',
+                                          g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
+                                                    Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES),
+                                        });
+        this._proxy.init(null);
+
+        this._proxy.connect('g-signal', Lang.bind(this, this._onSignal));
+        this._proxy.connect('notify::g-name-owner', Lang.bind(this, this._onNameOwnerChanged));
+    },
+
+    _onNameOwnerChanged: function(object, pspec) {
+        if (this._proxy.g_name_owner)
+            [this._locked] = this._proxy.call_sync('GetActive', null,
+                                                   Gio.DBusCallFlags.NONE, -1, null).deep_unpack();
+        else
+            this._locked = false;
+
+        this.emit('lock-status-changed', this._locked);
+    },
+
+    _onSignal: function(proxy, senderName, signalName, params) {
+        if (signalName == 'ActiveChanged') {
+            [this._locked] = params.deep_unpack();
+            this.emit('lock-status-changed', this._locked);
+        }
+    },
+
+    get locked() {
+        return this._locked;
+    },
+
+    lock: function() {
+        this._proxy.call('Lock', null, Gio.DBusCallFlags.NONE, -1, null,
+                         Lang.bind(this, function(proxy, result) {
+                             proxy.call_finish(result);
+
+                             this.emit('lock-screen-shown');
+                         }));
+    },
+
+    unlock: function() {
+        this._proxy.call('SetActive', GLib.Variant.new('(b)', false),
+                         Gio.DBusCallFlags.NONE, -1, null, null);
+    },
+});
+Signals.addSignalMethods(ScreenShieldFallback.prototype);

js/ui/searchDisplay.js

@@ -214,8 +214,6 @@ const SearchResults = new Lang.Class({
         for (let i = 0; i < this._providers.length; i++) {
             this.createProviderMeta(this._providers[i]);
         }
-        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
-        this.actor.add(this._searchProvidersBox);
 
         this._highlightDefault = false;
         this._defaultResult = null;
@@ -226,7 +224,7 @@ const SearchResults = new Lang.Class({
                                              vertical: true });
         let title = new St.Label({ style_class: 'search-section-header',
                                    text: provider.title });
-        providerBox.add(title);
+        providerBox.add(title, { x_fill: false, x_align: St.Align.START });
 
         let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
                                             x_fill: true,
@@ -302,9 +300,6 @@ const SearchResults = new Lang.Class({
             }
         }
 
-        if (!newDefaultResult)
-            newDefaultResult = this._searchProvidersBox.get_first_child();
-
         if (newDefaultResult != this._defaultResult) {
             if (this._defaultResult)
                 this._defaultResult.setSelected(false);

js/ui/sessionMode.js

@@ -1,94 +1,160 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
+const Signals = imports.signals;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 
-const DEFAULT_MODE = 'user';
+const DEFAULT_MODE = 'restrictive';
 
 const _modes = {
-    'gdm': { hasOverview: false,
-             showCalendarEvents: false,
-             allowSettings: false,
-             allowExtensions: false,
-             allowKeybindingsWhenModal: true,
-             hasRunDialog: false,
-             hasWorkspaces: false,
-             createSession: Main.createGDMSession,
-             createUnlockDialog: Main.createGDMLoginDialog,
-             panel: {
-                 left: [],
-                 center: ['dateMenu'],
-                 right: ['a11y', 'display', 'keyboard',
-                         'volume', 'battery', 'lockScreen', 'powerMenu']
-             }
-           },
+    'restrictive': {
+        hasOverview: false,
+        showCalendarEvents: false,
+        allowSettings: false,
+        allowExtensions: false,
+        allowKeybindingsWhenModal: false,
+        hasRunDialog: false,
+        hasWorkspaces: false,
+        hasWindows: false,
+        hasNotifications: false,
+        isLocked: false,
+        isGreeter: false,
+        isPrimary: false,
+        unlockDialog: null,
+        components: [],
+        panel: {
+            left: [],
+            center: [],
+            right: []
+        },
+    },
 
-    'initial-setup': { hasOverview: false,
-                       showCalendarEvents: false,
-                       allowSettings: false,
-                       allowExtensions: false,
-                       allowKeybindingsWhenModal: false,
-                       hasRunDialog: false,
-                       hasWorkspaces: false,
-                       createSession: Main.createInitialSetupSession,
-                       panel: {
-                           left: [],
-                           center: ['dateMenu'],
-                           right: ['a11y', 'keyboard', 'volume', 'lockScreen']
-                       }
-                     },
+    'gdm': {
+        allowKeybindingsWhenModal: true,
+        hasNotifications: true,
+        isGreeter: true,
+        isPrimary: true,
+        unlockDialog: imports.gdm.loginDialog.LoginDialog,
+        components: ['polkitAgent'],
+        panel: {
+            left: [],
+            center: ['dateMenu'],
+            right: ['a11y', 'display', 'keyboard',
+                    'volume', 'battery', 'powerMenu']
+        }
+    },
 
-    'user': { hasOverview: true,
-              showCalendarEvents: true,
-              allowSettings: true,
-              allowExtensions: true,
-              allowKeybindingsWhenModal: false,
-              hasRunDialog: true,
-              hasWorkspaces: true,
-              createSession: Main.createUserSession,
-              createUnlockDialog: Main.createSessionUnlockDialog,
-              panel: {
-                  left: ['activities', 'appMenu'],
-                  center: ['dateMenu'],
-                  right: ['a11y', 'keyboard', 'volume', 'bluetooth',
-                          'network', 'battery', 'lockScreen', 'userMenu']
-              }
-            }
+    'lock-screen': {
+        isLocked: true,
+        isGreeter: undefined,
+        unlockDialog: undefined,
+        components: ['polkitAgent', 'telepathyClient'],
+        panel: {
+            left: ['userMenu'],
+            center: [],
+            right: ['lockScreen']
+        },
+    },
+
+    'unlock-dialog': {
+        isLocked: true,
+        unlockDialog: undefined,
+        components: ['polkitAgent', 'telepathyClient'],
+        panel: {
+            left: ['userMenu'],
+            center: [],
+            right: ['a11y', 'keyboard', 'lockScreen']
+        },
+    },
+
+    'initial-setup': {
+        isPrimary: true,
+        components: ['keyring'],
+        panel: {
+            left: [],
+            center: ['dateMenu'],
+            right: ['a11y', 'keyboard', 'volume']
+        }
+    },
+
+    'user': {
+        hasOverview: true,
+        showCalendarEvents: true,
+        allowSettings: true,
+        allowExtensions: true,
+        hasRunDialog: true,
+        hasWorkspaces: true,
+        hasWindows: true,
+        hasNotifications: true,
+        isLocked: false,
+        isPrimary: true,
+        unlockDialog: imports.ui.unlockDialog.UnlockDialog,
+        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
+                     'keyring', 'recorder', 'autorunManager', 'automountManager'],
+        panel: {
+            left: ['activities', 'appMenu'],
+            center: ['dateMenu'],
+            right: ['a11y', 'keyboard', 'volume', 'bluetooth',
+                    'network', 'battery', 'userMenu']
+        }
+    }
 };
 
 function listModes() {
     let modes = Object.getOwnPropertyNames(_modes);
     for (let i = 0; i < modes.length; i++)
-        print(modes[i]);
+        if (_modes[modes[i]].isPrimary)
+            print(modes[i]);
 }
 
 const SessionMode = new Lang.Class({
     Name: 'SessionMode',
 
     _init: function() {
-        let params = _modes[global.session_mode];
+        global.connect('notify::session-mode', Lang.bind(this, this._sync));
+        let mode = _modes[global.session_mode].isPrimary ? global.session_mode
+                                                         : 'user';
+        this._modeStack = [mode];
+        this._sync();
+    },
 
+    pushMode: function(mode) {
+        this._modeStack.push(mode);
+        this._sync();
+    },
+
+    popMode: function(mode) {
+        if (this.currentMode != mode || this._modeStack.length === 1)
+            throw new Error("Invalid SessionMode.popMode");
+        this._modeStack.pop();
+        this._sync();
+    },
+
+    switchMode: function(to) {
+        if (this.currentMode == to)
+            return;
+        this._modeStack[this._modeStack.length - 1] = to;
+        this._sync();
+    },
+
+    get currentMode() {
+        return this._modeStack[this._modeStack.length - 1];
+    },
+
+    _sync: function() {
+        let params = _modes[this.currentMode];
         params = Params.parse(params, _modes[DEFAULT_MODE]);
 
-        this._createSession = params.createSession;
-        delete params.createSession;
-        this._createUnlockDialog = params.createUnlockDialog;
-        delete params.createUnlockDialog;
+        // A simplified version of Lang.copyProperties, handles
+        // undefined as a special case for "no change / inherit from previous mode"
+        for (let prop in params) {
+            if (params[prop] !== undefined)
+                this[prop] = params[prop];
+        }
 
-        Lang.copyProperties(params, this);
-    },
-
-    createSession: function() {
-        if (this._createSession)
-            this._createSession();
-    },
-
-    createUnlockDialog: function() {
-        if (this._createUnlockDialog)
-            return this._createUnlockDialog.apply(this, arguments);
-        else
-            return null;
-    },
+        this.emit('updated');
+    }
 });
+Signals.addSignalMethods(SessionMode.prototype);

js/ui/shellDBus.js

@@ -57,7 +57,10 @@ const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
     <arg name="active" direction="out" type="b" />
 </method>
 <method name="SetActive">
-    <arg name="value" direction="in" type="u" />
+    <arg name="value" direction="in" type="b" />
+</method>
+<method name="GetActiveTime">
+    <arg name="value" direction="out" type="u" />
 </method>
 <signal name="ActiveChanged">
     <arg name="new_value" type="b" />
@@ -340,29 +343,46 @@ const GnomeShellExtensions = new Lang.Class({
 const ScreenSaverDBus = new Lang.Class({
     Name: 'ScreenSaverDBus',
 
-    _init: function() {
+    _init: function(screenShield) {
         this.parent();
 
-        Main.screenShield.connect('lock-status-changed', Lang.bind(this, function(shield, locked) {
-            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [locked]));
+        this._screenShield = screenShield;
+        screenShield.connect('lock-status-changed', Lang.bind(this, function(shield) {
+            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.locked]));
         }));
 
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/ScreenSaver');
+
+        Gio.DBus.session.own_name('org.gnome.ScreenSaver', Gio.BusNameOwnerFlags.REPLACE, null, null);
     },
 
-    Lock: function() {
-        Main.screenShield.lock(true);
+    LockAsync: function(parameters, invocation) {
+        let tmpId = this._screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
+            this._screenShield.disconnect(tmpId);
+
+            invocation.return_value(null);
+        }));
+
+        this._screenShield.lock(true);
     },
 
     SetActive: function(active) {
         if (active)
-            Main.screenShield.lock(true);
+            this._screenShield.lock(true);
         else
-            Main.screenShield.unlock();
+            this._screenShield.unlock();
     },
 
     GetActive: function() {
-        return Main.screenShield.locked;
-    }
+        return this._screenShield.locked;
+    },
+
+    GetActiveTime: function() {
+        let started = this._screenShield.activationTime;
+        if (started > 0)
+            return Math.floor((GLib.get_monotonic_time() - started) / 1000000);
+        else
+            return 0;
+    },
 });

js/ui/shellEntry.js

@@ -76,6 +76,12 @@ const EntryMenu = new Lang.Class({
             this.actor.grab_key_focus();
 
         this.parent();
+        this._entry.add_style_pseudo_class('focus');
+    },
+
+    close: function() {
+        this._entry.grab_key_focus();
+        this.parent();
     },
 
     _updateCopyItem: function() {
@@ -126,34 +132,20 @@ function _setMenuAlignment(entry, stageX) {
         entry.menu.setSourceAlignment(entryX / entry.width);
 };
 
-function _onClicked(action, actor) {
-    let entry = actor.menu ? actor : actor.get_parent();
-
+function _onButtonPressEvent(actor, event, entry) {
     if (entry.menu.isOpen) {
         entry.menu.close();
-    } else if (action.get_button() == 3) {
-        let [stageX, stageY] = action.get_coords();
-        _setMenuAlignment(entry, stageX);
-        entry.menu.open();
-    }
-};
-
-function _onLongPress(action, actor, state) {
-    let entry = actor.menu ? actor : actor.get_parent();
-
-    if (state == Clutter.LongPressState.QUERY)
-        return action.get_button() == 1 && !entry.menu.isOpen;
-
-    if (state == Clutter.LongPressState.ACTIVATE) {
-        let [stageX, stageY] = action.get_coords();
+        return true;
+    } else if (event.get_button() == 3) {
+        let [stageX, stageY] = event.get_coords();
         _setMenuAlignment(entry, stageX);
         entry.menu.open();
+        return true;
     }
     return false;
 };
 
-function _onPopup(actor) {
-    let entry = actor.menu ? actor : actor.get_parent();
+function _onPopup(actor, entry) {
     let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
     if (success)
         entry.menu.setSourceAlignment(textX / entry.width);
@@ -168,20 +160,11 @@ function addContextMenu(entry, params) {
     entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry });
     entry._menuManager.addMenu(entry.menu);
 
-    let clickAction;
-
-    // Add a click action to both the entry and its clutter_text; the former
+    // Add an event handler to both the entry and its clutter_text; the former
     // so padding is included in the clickable area, the latter because the
     // event processing of ClutterText prevents event-bubbling.
-    clickAction = new Clutter.ClickAction();
-    clickAction.connect('clicked', _onClicked);
-    clickAction.connect('long-press', _onLongPress);
-    entry.clutter_text.add_action(clickAction);
+    entry.clutter_text.connect('button-press-event', Lang.bind(null, _onButtonPressEvent, entry));
+    entry.connect('button-press-event', Lang.bind(null, _onButtonPressEvent, entry));
 
-    clickAction = new Clutter.ClickAction();
-    clickAction.connect('clicked', _onClicked);
-    clickAction.connect('long-press', _onLongPress);
-    entry.add_action(clickAction);
-
-    entry.connect('popup-menu', _onPopup);
+    entry.connect('popup-menu', Lang.bind(null, _onPopup, entry));
 }

js/ui/status/accessibility.js

@@ -75,10 +75,6 @@ const ATIndicator = new Lang.Class({
         this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
     },
 
-    setLockedState: function(locked) {
-        this.actor.visible = !locked;
-    },
-
     _buildItemExtended: function(string, initial_value, writable, on_set) {
         let widget = new PopupMenu.PopupSwitchMenuItem(string, initial_value);
         if (!writable)

js/ui/status/bluetooth.js

@@ -88,11 +88,6 @@ const Indicator = new Lang.Class({
         this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
     },
 
-    setLockedState: function(locked) {
-        this._isLocked = locked;
-        this._updateKillswitch();
-    },
-
     _updateKillswitch: function() {
         let current_state = this._applet.killswitch_state;
         let on = current_state == GnomeBluetooth.KillswitchState.UNBLOCKED;
@@ -107,7 +102,7 @@ const Indicator = new Lang.Class({
             /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
             this._killswitch.setStatus(_("hardware disabled"));
 
-        this.actor.visible = !this._isLocked && has_adapter;
+        this.actor.visible = has_adapter;
 
         if (on) {
             this._discoverable.actor.show();
@@ -461,7 +456,10 @@ const PinNotification = new Lang.Class({
 
     _canActivateOkButton: function() {
         // PINs have a fixed length of 6
-        return this._entry.clutter_text.text.length == 6;
+        if (this._numeric)
+            return this._entry.clutter_text.text.length == 6;
+        else
+            return true;
     },
 
     grabFocus: function(lockTray) {

js/ui/status/keyboard.js

@@ -5,6 +5,7 @@ const GLib = imports.gi.GLib;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 const St = imports.gi.St;
 
 try {
@@ -45,6 +46,7 @@ const IBusManager = new Lang.Class({
         this._panelService = null;
         this._engines = {};
         this._ready = false;
+        this._registerPropertiesId = 0;
 
         this._nameWatcherId = Gio.DBus.session.watch_name(IBus.SERVICE_IBUS,
                                                           Gio.BusNameWatcherFlags.NONE,
@@ -63,6 +65,7 @@ const IBusManager = new Lang.Class({
         this._candidatePopup.setPanelService(null);
         this._engines = {};
         this._ready = false;
+        this._registerPropertiesId = 0;
     },
 
     _onNameAppeared: function() {
@@ -100,6 +103,11 @@ const IBusManager = new Lang.Class({
             this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
                                                          object_path: IBus.PATH_PANEL });
             this._candidatePopup.setPanelService(this._panelService);
+            // Need to set this to get 'global-engine-changed' emitions
+            this._ibus.set_watch_ibus_signal(true);
+            this._ibus.connect('global-engine-changed', Lang.bind(this, this._resetProperties));
+            this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
+            this._resetProperties();
         } else {
             this._clear();
             return;
@@ -116,6 +124,39 @@ const IBusManager = new Lang.Class({
             this._readyCallback();
     },
 
+    _resetProperties: function() {
+        this.emit('properties-registered', null);
+
+        if (this._registerPropertiesId != 0)
+            return;
+
+        this._registerPropertiesId =
+            this._panelService.connect('register-properties', Lang.bind(this, function(p, props) {
+                if (!props.get(0))
+                    return;
+
+                this._panelService.disconnect(this._registerPropertiesId);
+                this._registerPropertiesId = 0;
+
+                this.emit('properties-registered', props);
+            }));
+    },
+
+    _updateProperty: function(panel, prop) {
+        this.emit('property-updated', prop);
+    },
+
+    activateProperty: function(key, state) {
+        this._panelService.property_activate(key, state);
+    },
+
+    hasProperties: function(id) {
+        if (id == 'anthy')
+            return true;
+
+        return false;
+    },
+
     getEngineDesc: function(id) {
         if (!IBus || !this._ready)
             return null;
@@ -123,6 +164,7 @@ const IBusManager = new Lang.Class({
         return this._engines[id];
     }
 });
+Signals.addSignalMethods(IBusManager.prototype);
 
 const LayoutMenuItem = new Lang.Class({
     Name: 'LayoutMenuItem',
@@ -135,6 +177,7 @@ const LayoutMenuItem = new Lang.Class({
         this.indicator = new St.Label({ text: shortName });
         this.addActor(this.label);
         this.addActor(this.indicator);
+        this.actor.label_actor = this.label;
     }
 });
 
@@ -142,6 +185,12 @@ const InputSourceIndicator = new Lang.Class({
     Name: 'InputSourceIndicator',
     Extends: PanelMenu.Button,
 
+    _propertiesWhitelist: [
+        'InputMode',
+        'TypingMode',
+        'DictMode'
+    ],
+
     _init: function() {
         this.parent(0.0, _("Keyboard"));
 
@@ -162,56 +211,73 @@ const InputSourceIndicator = new Lang.Class({
         this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
         this._xkbInfo = new GnomeDesktop.XkbInfo();
 
-        this._ibusManager = new IBusManager(Lang.bind(this, this._inputSourcesChanged));
+        this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(this._propSeparator);
+        this._propSection = new PopupMenu.PopupMenuSection();
+        this.menu.addMenuItem(this._propSection);
+        this._propSection.actor.hide();
 
+        this._properties = null;
+
+        this._ibusManager = new IBusManager(Lang.bind(this, this._inputSourcesChanged));
+        this._ibusManager.connect('properties-registered', Lang.bind(this, this._ibusPropertiesRegistered));
+        this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
         this._inputSourcesChanged();
 
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this._showLayoutItem = this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
+
+        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
+    },
+
+    _sessionUpdated: function() {
         // re-using "allowSettings" for the keyboard layout is a bit shady,
         // but at least for now it is used as "allow popping up windows
         // from shell menus"; we can always add a separate sessionMode
         // option if need arises.
-        if (Main.sessionMode.allowSettings) {
-            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-            this._showLayoutItem = this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
-        }
-        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
-    },
-
-    setLockedState: function(locked) {
-        if (Main.sessionMode.allowSettings) {
-            this._showLayoutItem.actor.visible = !locked;
-        }
-        this.menu.setSettingsVisibility(!locked);
+        this._showLayoutItem.actor.visible = Main.sessionMode.allowSettings;
     },
 
     _currentInputSourceChanged: function() {
         let nVisibleSources = Object.keys(this._layoutItems).length;
-        if (nVisibleSources < 2)
-            return;
-
-        let nSources = this._settings.get_value(KEY_INPUT_SOURCES).n_children();
         let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        if (newCurrentSourceIndex >= nSources)
-            return;
+        let newLayoutItem = this._layoutItems[newCurrentSourceIndex];
+        let hasProperties;
 
-        if (!this._layoutItems[newCurrentSourceIndex]) {
-            // This source index is invalid as we weren't able to
-            // build a menu item for it, so we hide ourselves since we
-            // can't fix it here. *shrug*
+        if (newLayoutItem)
+            hasProperties = this._ibusManager.hasProperties(newLayoutItem.ibusEngineId);
+        else
+            hasProperties = false;
+
+        if (!newLayoutItem || (nVisibleSources < 2 && !hasProperties)) {
+            // This source index might be invalid if we weren't able
+            // to build a menu item for it, so we hide ourselves since
+            // we can't fix it here. *shrug*
+
+            // We also hide if we have only one visible source unless
+            // it's an IBus source with properties.
             this.menu.close();
             this.actor.hide();
             return;
-        } else {
-            this.actor.show();
         }
 
+        this.actor.show();
+
         if (this._layoutItems[this._currentSourceIndex]) {
             this._layoutItems[this._currentSourceIndex].setShowDot(false);
             this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
         }
 
-        this._layoutItems[newCurrentSourceIndex].setShowDot(true);
-        this._container.set_skip_paint(this._labelActors[newCurrentSourceIndex], false);
+        newLayoutItem.setShowDot(true);
+
+        let newLabelActor = this._labelActors[newCurrentSourceIndex];
+        this._container.set_skip_paint(newLabelActor, false);
+
+        if (hasProperties)
+            newLabelActor.set_text(newLayoutItem.indicator.get_text());
 
         this._currentSourceIndex = newCurrentSourceIndex;
     },
@@ -242,9 +308,12 @@ const InputSourceIndicator = new Lang.Class({
             } else if (type == INPUT_SOURCE_TYPE_IBUS) {
                 let engineDesc = this._ibusManager.getEngineDesc(id);
                 if (engineDesc) {
+                    let language = IBus.get_language_name(engineDesc.get_language());
+
                     info.exists = true;
-                    info.displayName = engineDesc.get_longname();
-                    info.shortName = engineDesc.get_symbol();
+                    info.displayName = language + ' (' + engineDesc.get_longname() + ')';
+                    info.shortName = this._makeEngineShortName(engineDesc);
+                    info.ibusEngineId = id;
                 }
             }
 
@@ -259,13 +328,6 @@ const InputSourceIndicator = new Lang.Class({
             infos.push(info);
         }
 
-        if (infos.length > 1) {
-            this.actor.show();
-        } else {
-            this.menu.close();
-            this.actor.hide();
-        }
-
         for (let i = 0; i < infos.length; i++) {
             let info = infos[i];
             if (infosByShortName[info.shortName].length > 1) {
@@ -274,6 +336,7 @@ const InputSourceIndicator = new Lang.Class({
             }
 
             let item = new LayoutMenuItem(info.displayName, info.shortName);
+            item.ibusEngineId = info.ibusEngineId;
             this._layoutItems[info.sourceIndex] = item;
             this.menu.addMenuItem(item, i);
             item.connect('activate', Lang.bind(this, function() {
@@ -319,6 +382,146 @@ const InputSourceIndicator = new Lang.Class({
         Util.spawn(['gkbd-keyboard-display', '-l', description]);
     },
 
+    _makeEngineShortName: function(engineDesc) {
+        let symbol = engineDesc.get_symbol();
+        if (symbol && symbol[0])
+            return symbol;
+
+        let langCode = engineDesc.get_language().split('_', 1)[0];
+        if (langCode.length == 2 || langCode.length == 3)
+            return langCode.toLowerCase();
+
+        return String.fromCharCode(0x2328); // keyboard glyph
+    },
+
+    _propertyWhitelisted: function(prop) {
+        for (let i = 0; i < this._propertiesWhitelist.length; ++i) {
+            let key = prop.get_key();
+            if (key.substr(0, this._propertiesWhitelist[i].length) == this._propertiesWhitelist[i])
+                return true;
+        }
+        return false;
+    },
+
+    _ibusPropertiesRegistered: function(im, props) {
+        this._properties = props;
+        this._buildPropSection();
+    },
+
+    _ibusPropertyUpdated: function(im, prop) {
+        if (!this._propertyWhitelisted(prop))
+            return;
+
+        if (this._updateSubProperty(this._properties, prop))
+            this._buildPropSection();
+    },
+
+    _updateSubProperty: function(props, prop) {
+        if (!props)
+            return false;
+
+        let p;
+        for (let i = 0; (p = props.get(i)) != null; ++i) {
+            if (p.get_key() == prop.get_key() && p.get_prop_type() == prop.get_prop_type()) {
+                p.update(prop);
+                return true;
+            } else if (p.get_prop_type() == IBus.PropType.MENU) {
+                if (this._updateSubProperty(p.get_sub_props(), prop))
+                    return true;
+            }
+        }
+        return false;
+    },
+
+    _updateIndicatorLabel: function(text) {
+        let layoutItem = this._layoutItems[this._currentSourceIndex];
+        let hasProperties;
+
+        if (layoutItem)
+            hasProperties = this._ibusManager.hasProperties(layoutItem.ibusEngineId);
+        else
+            hasProperties = false;
+
+        if (hasProperties)
+            this._labelActors[this._currentSourceIndex].set_text(text);
+    },
+
+    _buildPropSection: function() {
+        this._propSeparator.actor.hide();
+        this._propSection.actor.hide();
+        this._propSection.removeAll();
+
+        this._buildPropSubMenu(this._propSection, this._properties);
+
+        if (!this._propSection.isEmpty()) {
+            this._propSection.actor.show();
+            this._propSeparator.actor.show();
+        }
+    },
+
+    _buildPropSubMenu: function(menu, props) {
+        if (!props)
+            return;
+
+        let radioGroup = [];
+        let p;
+        for (let i = 0; (p = props.get(i)) != null; ++i) {
+            let prop = p;
+
+            if (!this._propertyWhitelisted(prop) ||
+                !prop.get_visible())
+                continue;
+
+            if (prop.get_key() == 'InputMode') {
+                let text;
+                if (prop.get_symbol)
+                    text = prop.get_symbol().get_text();
+                else
+                    text = prop.get_label().get_text();
+
+                if (text && text.length > 0 && text.length < 3)
+                    this._updateIndicatorLabel(text);
+            }
+
+            let item;
+            let type = prop.get_prop_type();
+            if (type == IBus.PropType.MENU) {
+                item = new PopupMenu.PopupSubMenuMenuItem(prop.get_label().get_text());
+                this._buildPropSubMenu(item.menu, prop.get_sub_props());
+            } else if (type == IBus.PropType.RADIO) {
+                item = new PopupMenu.PopupMenuItem(prop.get_label().get_text());
+                item.prop = prop;
+                radioGroup.push(item);
+                item.radioGroup = radioGroup;
+                item.setShowDot(prop.get_state() == IBus.PropState.CHECKED);
+                item.connect('activate', Lang.bind(this, function() {
+                    if (item.prop.get_state() == IBus.PropState.CHECKED)
+                        return;
+
+                    let group = item.radioGroup;
+                    for (let i = 0; i < group.length; ++i) {
+                        if (group[i] == item) {
+                            item.setShowDot(true);
+                            item.prop.set_state(IBus.PropState.CHECKED);
+                            this._ibusManager.activateProperty(item.prop.get_key(),
+                                                               IBus.PropState.CHECKED);
+                        } else {
+                            group[i].setShowDot(false);
+                            group[i].prop.set_state(IBus.PropState.UNCHECKED);
+                            this._ibusManager.activateProperty(group[i].prop.get_key(),
+                                                               IBus.PropState.UNCHECKED);
+                        }
+                    }
+                }));
+            } else {
+                continue;
+            }
+
+            item.setSensitive(prop.get_sensitive());
+            menu.addMenuItem(item);
+        }
+    },
+
     _containerGetPreferredWidth: function(container, for_height, alloc) {
         // Here, and in _containerGetPreferredHeight, we need to query
         // for the height of all children, but we ignore the results

js/ui/status/lockScreenMenu.js

@@ -16,7 +16,6 @@ const Indicator = new Lang.Class({
 
     _init: function() {
         this.parent(null, _("Volume, network, battery"));
-        this.actor.hide();
 
         this._volume = Main.panel.statusArea.volume;
         if (this._volume) {
@@ -54,9 +53,5 @@ const Indicator = new Lang.Class({
             this._battery.mainIcon.bind_property('visible', this._batteryIcon, 'visible',
                                                  GObject.BindingFlags.SYNC_CREATE);
         }
-    },
-
-    setLockedState: function(locked) {
-        this.actor.visible = locked;
     }
 });

js/ui/status/network.js

@@ -1562,16 +1562,15 @@ const NMApplet = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('network-offline', _('Network'));
+        this.parent('network-offline-symbolic', _('Network'));
 
         this.secondaryIcon = this.addIcon(new Gio.ThemedIcon({ name: 'network-vpn-symbolic' }));
         this.secondaryIcon.hide();
 
-        this._isLocked = false;
         this._client = NMClient.Client.new();
 
         this._statusSection = new PopupMenu.PopupMenuSection();
-        this._statusItem = new PopupMenu.PopupMenuItem('', { style_class: 'popup-inactive-menu-item', reactive: false });
+        this._statusItem = new PopupMenu.PopupMenuItem('', { reactive: false });
         this._statusSection.addMenuItem(this._statusItem);
         this._statusSection.addAction(_("Enable networking"), Lang.bind(this, function() {
             this._client.networking_enabled = true;
@@ -1675,11 +1674,6 @@ const NMApplet = new Lang.Class({
         }));
     },
 
-    setLockedState: function(locked) {
-        this._isLocked = locked;
-        this._syncNMState();
-    },
-
     _ensureSource: function() {
         if (!this._source) {
             this._source = new MessageTray.Source(_("Network Manager"),
@@ -2063,7 +2057,7 @@ const NMApplet = new Lang.Class({
 
     _syncNMState: function() {
         this.mainIcon.visible = this._client.manager_running;
-        this.actor.visible = this.mainIcon.visible && !this._isLocked;
+        this.actor.visible = this.mainIcon.visible;
 
         if (!this._client.networking_enabled) {
             this.setIcon('network-offline-symbolic');

js/ui/status/power.js

@@ -56,7 +56,6 @@ const Indicator = new Lang.Class({
 
         this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
 
-        this._isLocked = false;
         this._deviceItems = [ ];
         this._hasPrimary = false;
         this._primaryDeviceId = null;
@@ -77,11 +76,6 @@ const Indicator = new Lang.Class({
         this._devicesChanged();
     },
 
-    setLockedState: function(locked) {
-        this._isLocked = locked;
-        this._syncIcon();
-    },
-
     _readPrimaryDevice: function() {
         this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
             if (error) {
@@ -102,7 +96,7 @@ const Indicator = new Lang.Class({
                     let minutes = time % 60;
                     let hours = Math.floor(time / 60);
                     let timestring;
-                    if (time > 60) {
+                    if (time >= 60) {
                         if (minutes == 0) {
                             timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
                         } else {
@@ -160,7 +154,7 @@ const Indicator = new Lang.Class({
             hasIcon = true;
         }
         this.mainIcon.visible = hasIcon;
-        this.actor.visible = hasIcon && !this._isLocked;
+        this.actor.visible = hasIcon;
     },
 
     _devicesChanged: function() {

js/ui/status/volume.js

@@ -62,6 +62,8 @@ const VolumeMenu = new Lang.Class({
         this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
         this.addMenuItem(this._inputTitle);
         this.addMenuItem(this._inputSlider);
+
+        this._onControlStateChanged();
     },
 
     scroll: function(direction) {
@@ -90,6 +92,7 @@ const VolumeMenu = new Lang.Class({
         if (this._control.get_state() == Gvc.MixerControlState.READY) {
             this._readOutput();
             this._readInput();
+            this._maybeShowInput();
         } else {
             this.emit('icon-changed', null);
         }
@@ -217,8 +220,6 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent('audio-volume-muted-symbolic', _("Volume"));
 
-        this._isLocked = false;
-
         this._control = getMixerControl();
         this._volumeMenu = new VolumeMenu(this._control);
         this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) {
@@ -235,13 +236,8 @@ const Indicator = new Lang.Class({
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
     },
 
-    setLockedState: function(locked) {
-        this._isLocked = locked;
-        this._syncVisibility();
-    },
-
     _syncVisibility: function() {
-        this.actor.visible = this._hasPulseAudio && !this._isLocked;
+        this.actor.visible = this._hasPulseAudio;
         this.mainIcon.visible = this._hasPulseAudio;
     },
 

js/ui/unlockDialog.js

@@ -2,7 +2,7 @@
 
 const AccountsService = imports.gi.AccountsService;
 const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
+const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
@@ -23,6 +23,35 @@ const GdmUtil = imports.gdm.util;
 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;
 
+function versionCompare(required, reference) {
+    required = required.split('.');
+    reference = reference.split('.');
+
+    for (let i = 0; i < required.length; i++) {
+        if (required[i] != reference[i])
+            return required[i] < reference[i];
+    }
+
+    return true;
+}
+
+function isSupported() {
+    try {
+        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
+        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
+                                               '/org/gnome/DisplayManager/Manager',
+                                               'org.freedesktop.DBus.Properties',
+                                               'Get', params, null,
+                                               Gio.DBusCallFlags.NONE,
+                                               -1, null);
+
+        let version = result.deep_unpack()[0].deep_unpack();
+        return versionCompare('3.5.91', version);
+    } catch(e) {
+        return false;
+    }
+}
+
 // A widget showing the user avatar and name
 const UserWidget = new Lang.Class({
     Name: 'UserWidget',
@@ -41,6 +70,7 @@ const UserWidget = new Lang.Class({
         this.actor.add(this._label,
                        { expand: true,
                          x_fill: true,
+                         y_fill: false,
                          y_align: St.Align.MIDDLE });
 
         this._userLoadedId = this._user.connect('notify::is-loaded',
@@ -89,13 +119,17 @@ const UnlockDialog = new Lang.Class({
         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 GdmUtil.ShellUserVerifier(this._greeterClient, { reauthenticationOnly: true });
 
-        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
         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));
@@ -112,7 +146,8 @@ const UnlockDialog = new Lang.Class({
 
         this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                            can_focus: true });
-        ShellEntry.addContextMenu(this._promptEntry);
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
         this.setInitialKeyFocus(this._promptEntry);
         this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
 
@@ -122,6 +157,9 @@ const UnlockDialog = new Lang.Class({
 
         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);
@@ -134,8 +172,7 @@ const UnlockDialog = new Lang.Class({
                            default: true };
         this.setButtons([cancelButton, this._okButton]);
 
-        this._updateOkButton(false);
-        this._reset();
+        this._updateSensitivity(true);
 
         let otherUserLabel = new St.Label({ text: _("Log in as another user"),
                                             style_class: 'login-dialog-not-listed-label' });
@@ -150,6 +187,9 @@ const UnlockDialog = new Lang.Class({
                               { x_align: St.Align.START,
                                 x_fill: false });
 
+        let batch = new Batch.Hold();
+        this._userVerifier.begin(this._userName, batch);
+
         GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
             this.emit('loaded');
             return false;
@@ -161,24 +201,43 @@ const UnlockDialog = new Lang.Class({
         this._idleWatchId = this._idleMonitor.add_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
     },
 
-    _updateOkButton: function(sensitive) {
+    _updateSensitivity: function(sensitive) {
+        this._promptEntry.reactive = sensitive;
+        this._promptEntry.clutter_text.editable = sensitive;
         this._okButton.button.reactive = sensitive;
+        this._okButton.button.can_focus = sensitive;
     },
 
-    _reset: function() {
-        this._userVerifier.clear();
-        this._userVerifier.begin(this._userName, new Batch.Hold());
+    _showMessage: function(userVerifier, message, styleClass) {
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            GdmUtil.fadeInActor(this._promptMessage);
+        } else {
+            GdmUtil.fadeOutActor(this._promptMessage);
+        }
     },
 
     _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
+        if (this._firstQuestion && this._firstQuestionAnswer) {
+            this._userVerifier.answerQuery(serviceName, this._firstQuestionAnswer);
+            this._firstQuestionAnswer = null;
+            this._firstQuestion = false;
+            return;
+        }
+
         this._promptLabel.text = question;
 
-        this._promptEntry.text = '';
+        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._updateOkButton(true);
+        this._updateSensitivity(true);
     },
 
     _showLoginHint: function(verifier, message) {
@@ -191,13 +250,22 @@ const UnlockDialog = new Lang.Class({
     },
 
     _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);
+            return;
+        }
+
         if (!this._currentQuery)
             return;
 
         let query = this._currentQuery;
         this._currentQuery = null;
 
-        this._updateOkButton(false);
+        this._updateSensitivity(false);
 
         this._userVerifier.answerQuery(query, this._promptEntry.text);
     },
@@ -207,13 +275,24 @@ const UnlockDialog = new Lang.Class({
         this.emit('unlocked');
     },
 
-    _onVerificationFailed: function() {
-        this._userVerifier.cancel();
+    _onReset: function() {
         this.emit('failed');
     },
 
+    _onVerificationFailed: function() {
+        this._currentQuery = null;
+        this._firstQuestion = true;
+
+        this._promptEntry.text = '';
+        this._promptEntry.clutter_text.set_password_char('\u25cf');
+        this._promptEntry.menu.isPassword = true;
+
+        this._updateSensitivity(false);
+    },
+
     _escape: function() {
-        this._onVerificationFailed();
+        this._userVerifier.cancel();
+        this.emit('failed');
     },
 
     _otherUserClicked: function(button, event) {

js/ui/userMenu.js

@@ -12,6 +12,7 @@ const Tp = imports.gi.TelepathyGLib;
 const UPowerGlib = imports.gi.UPowerGlib;
 const Atk = imports.gi.Atk;
 
+const BoxPointer = imports.ui.boxpointer;
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
@@ -25,6 +26,7 @@ const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 const DISABLE_LOG_OUT_KEY = 'disable-log-out';
 const LOCK_ENABLED_KEY = 'lock-enabled';
+const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
 
 const DIALOG_ICON_SIZE = 64;
 
@@ -58,6 +60,11 @@ const UserAvatarWidget = new Lang.Class({
                                   reactive: params.reactive });
     },
 
+    setSensitive: function(sensitive) {
+        this.actor.can_focus = sensitive;
+        this.actor.reactive = sensitive;
+    },
+
     update: function() {
         let iconFile = this._user.get_icon_file();
         if (!GLib.file_test(iconFile, GLib.FileTest.EXISTS))
@@ -67,6 +74,11 @@ const UserAvatarWidget = new Lang.Class({
             let file = Gio.File.new_for_path(iconFile);
             this.actor.child = null;
             this.actor.style = 'background-image: url("%s");'.format(iconFile);
+
+            // AccountsService uses a fixed location for avatar images, so
+            // we need to clear out all cached data to pick up image changes,
+            // see https://bugzilla.gnome.org/show_bug.cgi?id=679268
+            this.actor.clear_background_image();
         } else {
             this.actor.style = null;
             this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
@@ -236,6 +248,10 @@ const IMStatusChooserItem = new Lang.Class({
             if (this.actor.mapped)
                 this._updateUser();
         }));
+
+        this.connect('sensitive-changed', function(sensitive) {
+            this._avatar.setSensitive(sensitive);
+        });
     },
 
     _restorePresence: function() {
@@ -496,6 +512,8 @@ const UserMenuButton = new Lang.Class({
                                        style_class: 'popup-menu-icon' });
         this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending-symbolic',
                                           style_class: 'popup-menu-icon' });
+        this._lockedIcon = new St.Icon({ icon_name: 'changes-prevent-symbolic',
+                                         style_class: 'popup-menu-icon' });
 
         this._accountMgr.connect('most-available-presence-changed',
                                   Lang.bind(this, this._updatePresenceIcon));
@@ -560,10 +578,20 @@ const UserMenuButton = new Lang.Class({
                                        Lang.bind(this, this._updateHaveShutdown));
 
         this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
     },
 
-    setLockedState: function(locked) {
-        this.actor.visible = !locked;
+    _sessionUpdated: function() {
+        this.actor.visible = !Main.sessionMode.isGreeter;
+
+        let allowSettings = Main.sessionMode.allowSettings;
+        this._statusChooser.setSensitive(allowSettings);
+        this._systemSettings.visible = allowSettings;
+
+        this.setSensitive(!Main.sessionMode.isLocked);
+        this._updatePresenceIcon();
     },
 
     _onDestroy: function() {
@@ -586,19 +614,19 @@ const UserMenuButton = new Lang.Class({
     _updateSwitchUser: function() {
         let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
         let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
-        let multiSession = Gdm.get_session_ids().length > 1;
 
-        this._loginScreenItem.label.set_text(multiUser ? _("Switch User")
-                                                       : _("Switch Session"));
-        this._loginScreenItem.actor.visible = allowSwitch && (multiUser || multiSession);
+        this._loginScreenItem.actor.visible = allowSwitch && multiUser;
     },
 
     _updateLogout: function() {
         let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
+        let systemAccount = this._user.system_account;
+        let localAccount = this._user.local_account;
         let multiUser = this._userManager.has_multiple_users;
         let multiSession = Gdm.get_session_ids().length > 1;
 
-        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
+        this._logoutItem.actor.visible = allowLogout && (alwaysShow || multiUser || multiSession || systemAccount || !localAccount);
     },
 
     _updateLockScreen: function() {
@@ -647,7 +675,9 @@ const UserMenuButton = new Lang.Class({
     },
 
     _updatePresenceIcon: function(accountMgr, presence, status, message) {
-        if (presence == Tp.ConnectionPresenceType.AVAILABLE)
+        if (Main.sessionMode.isLocked)
+            this._iconBox.child = this._lockedIcon;
+        else if (presence == Tp.ConnectionPresenceType.AVAILABLE)
             this._iconBox.child = this._availableIcon;
         else if (presence == Tp.ConnectionPresenceType.BUSY)
             this._iconBox.child = this._busyIcon;
@@ -707,8 +737,7 @@ const UserMenuButton = new Lang.Class({
         let item;
 
         item = new IMStatusChooserItem();
-        if (Main.sessionMode.allowSettings)
-            item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
         this.menu.addMenuItem(item);
         this._statusChooser = item;
 
@@ -720,11 +749,10 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        if (Main.sessionMode.allowSettings) {
-            item = new PopupMenu.PopupMenuItem(_("System Settings"));
-            item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-            this.menu.addMenuItem(item);
-        }
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
+        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+        this.menu.addMenuItem(item);
+        this._systemSettings = item;
 
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
@@ -792,14 +820,15 @@ const UserMenuButton = new Lang.Class({
     },
 
     _onLockScreenActivate: function() {
+        this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
         Main.screenShield.lock(true);
     },
 
     _onLoginScreenActivate: function() {
+        this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();
-        if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY))
-            Main.screenShield.lock(false);
+        Main.screenShield.lock(false);
         Gdm.goto_login_session_sync(null);
     },
 
@@ -829,6 +858,7 @@ const UserMenuButton = new Lang.Class({
                     this._upClient.suspend_sync(null);
                 }));
 
+                this.menu.close(BoxPointer.PopupAnimation.NONE);
                 Main.screenShield.lock(true);
             } else {
                 this._upClient.suspend_sync(null);

js/ui/viewSelector.js

@@ -11,7 +11,6 @@ const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;
-const PlaceDisplay = imports.ui.placeDisplay;
 const RemoteSearch = imports.ui.remoteSearch;
 const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
@@ -98,7 +97,6 @@ const ViewSelector = new Lang.Class({
         this.addSearchProvider(new Wanda.WandaSearchProvider());
         this.addSearchProvider(new AppDisplay.AppSearchProvider());
         this.addSearchProvider(new AppDisplay.SettingsSearchProvider());
-        this.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
 
         // Load remote search providers provided by applications
         RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
@@ -311,7 +309,7 @@ const ViewSelector = new Lang.Class({
 
     startSearch: function(event) {
         global.stage.set_key_focus(this._text);
-        this._text.event(event, false);
+        this._text.event(event, true);
     },
 
     // the entry does not show the hint

js/ui/wanda.js

@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const IconGrid = imports.ui.iconGrid;
@@ -50,21 +48,12 @@ const WandaIcon = new Lang.Class({
     },
 
     createIcon: function(iconSize) {
-        if (this._animations)
-            this._animations.destroy();
-
         if (!this._imageFile) {
             return new St.Icon({ icon_name: 'face-smile',
                                  icon_size: iconSize });
         }
 
         this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight);
-        this._animations.connect('destroy', Lang.bind(this, function() {
-            if (this._timeoutId)
-                GLib.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-            this._animations = null;
-        }));
         this._animations.connect('notify::mapped', Lang.bind(this, function() {
             if (this._animations.mapped && !this._timeoutId) {
                 this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));
@@ -77,11 +66,16 @@ const WandaIcon = new Lang.Class({
             }
         }));
 
-        this._i = 0;
-
         return this._animations;
     },
 
+    _createIconTexture: function(size) {
+        if (size == this.iconSize)
+            return;
+
+        this.parent(size);
+    },
+
     _update: function() {
         let n = this._animations.get_n_children();
         if (n == 0) {
@@ -173,15 +167,8 @@ const WandaSearchProvider = new Lang.Class({
                     // only one which speaks the truth!
                     'name': capitalize(fish[0]),
                     'createIcon': function(iconSize) {
-                        // for DND only (maybe could be improved)
-                        // DON'T use St.Icon here, it crashes the shell
-                        // (dnd.js code assumes it can query the actor size
-                        // without parenting it, while StWidget accesses
-                        // StThemeNode in get_preferred_width/height, which
-                        // triggers an assertion failure)
-                        return St.TextureCache.get_default().load_icon_name(null,
-                                                                            'face-smile',
-                                                                            iconSize);
+                        return new St.Icon({ gicon: Gio.icon_new_for_string('face-smile'),
+                                             icon_size: iconSize });
                     }
                   }]);
     },

js/ui/workspaceThumbnail.js

@@ -620,9 +620,7 @@ const ThumbnailsBox = new Lang.Class({
         if (!source.realWindow && !source.shellWorkspaceLaunch && source != Main.xdndHandler)
             return DND.DragMotionResult.CONTINUE;
 
-        if (!Meta.prefs_get_dynamic_workspaces())
-            return DND.DragMotionResult.CONTINUE;
-
+        let canCreateWorkspaces = Meta.prefs_get_dynamic_workspaces();
         let spacing = this.actor.get_theme_node().get_length('spacing');
 
         this._dropWorkspace = -1;
@@ -647,7 +645,7 @@ const ThumbnailsBox = new Lang.Class({
             if (i == this._dropPlaceholderPos)
                 targetBottom += this._dropPlaceholder.get_height();
 
-            if (y > targetTop && y <= targetBottom && source != Main.xdndHandler) {
+            if (y > targetTop && y <= targetBottom && source != Main.xdndHandler && canCreateWorkspaces) {
                 placeholderPos = i;
                 break;
             } else if (y > targetBottom && y <= nextTargetTop) {
@@ -785,7 +783,7 @@ const ThumbnailsBox = new Lang.Class({
         this._indicator.raise_top();
     },
 
-    removeThumbmails: function(start, count) {
+    removeThumbnails: function(start, count) {
         let currentPos = 0;
         for (let k = 0; k < this._thumbnails.length; k++) {
             let thumbnail = this._thumbnails[k];

js/ui/workspacesView.js

@@ -932,16 +932,17 @@ const WorkspacesDisplay = new Lang.Class({
             let monitors = Main.layoutManager.monitors;
             let m = 0;
             for (let i = 0; i < monitors.length; i++) {
-                if (this._workspacesOnlyOnPrimaryChanged &&
+                if (this._workspacesOnlyOnPrimary &&
                     i != this._primaryIndex)
                     continue;
 
                 // Assume workspaces are only added at the end
                 for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
                     let metaWorkspace = global.screen.get_workspace_by_index(w);
-                    this._workspaces[m++][w] =
+                    this._workspaces[m][w] =
                         new Workspace.Workspace(metaWorkspace, i);
                 }
+                m++;
             }
 
             this._thumbnailsBox.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
@@ -968,7 +969,7 @@ const WorkspacesDisplay = new Lang.Class({
                 }
             }
 
-            this._thumbnailsBox.removeThumbmails(removedIndex, removedNum);
+            this._thumbnailsBox.removeThumbnails(removedIndex, removedNum);
         }
 
         for (let i = 0; i < this._workspacesViews.length; i++)

man/Makefile.am

@@ -1 +1,19 @@
-dist_man_MANS = gnome-shell.1
+XSLTPROC_FLAGS = \
+        --nonet \
+        --stringparam man.output.quietly 1 \
+        --stringparam funcsynopsis.style ansi \
+        --stringparam man.th.extra1.suppress 1 \
+        --stringparam man.authors.section.enabled 0 \
+        --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+man_MANS = \
+	gnome-shell.1
+
+xml_files = $(man_MANS:.1=.xml)
+
+EXTRA_DIST = $(xml_files)
+
+DISTCLEANFILES = $(man_MANS)

man/gnome-shell.1

@@ -1,94 +0,0 @@
-.\" Copyright (c) 2009, Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-.\"
-.\" This is free documentation; 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 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-.\" Boston, MA  02111-1301  USA.
-.TH GNOME-SHELL 1
-.SH NAME
-gnome-shell \- Graphical shell for the GNOME desktop
-
-.SH SYNOPSIS
-.B gnome-shell [options]
-
-.SH DESCRIPTION
-GNOME Shell provides core user interface functions for the GNOME 3
-desktop, like switching to windows and launching applications. GNOME
-Shell takes advantage of the capabilities of modern graphics hardware
-and introduces innovative user interface concepts to provide a
-visually attractive and easy to use experience.
-
-.SH OPTIONS
-
-.TP
-.B \-\-replace
-Replace the running window manager
-.br
-
-.TP
-.B \-\-sm-disable
-Disable connection to the session manager
-.br
-
-.TP
-.B \-\-sm-client-id=ID
-Specify session management ID
-.br
-
-.TP
-.B \-\-sm-save-file=FILE
-Initialize session from savefile
-.br
-
-.TP
-.B \-\-screen=SCREEN
-X screen to use
-.br
-
-.TP
-.B \-d, \-\-display=DISPLAY
-X display to use
-.br
-
-.TP
-.B \-\-sync
-Make X calls synchronous
-.br
-
-.TP
-.B \-\-version
-Print version and exit
-.br
-
-.TP
-.B \-\-help
-Display help and exit
-.br
-
-.SH BUGS
-The bug tracker can be reached by visiting the website
-\fIhttps://bugzilla.gnome.org/buglist.cgi?product=gnome-shell\fR
-
-Before sending a bug report, please verify that you have the latest
-version of gnome-shell. Many bugs (major and minor) are fixed at each
-release, and if yours is out of date, the problem may already have
-been solved.
-
-.SH ADDITIONAL INFORMATION
-
-For further information, visit the website \fIhttp://live.gnome.org/GnomeShell\fR

man/gnome-shell.xml

@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="gnome-shell">
+
+        <refentryinfo>
+                <title>gnome-shell</title>
+                <productname>gnome-shell</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>wrote the original gnome-shell man page</contrib>
+                                <firstname>Marcelo Jorge</firstname>
+                                <surname>Vieira</surname>
+                                <email>metal@alucinados.com</email>
+                        </author>
+                </authorgroup>
+
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>gnome-shell</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>gnome-shell</refname>
+                <refpurpose>Graphical shell for the GNOME desktop</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>gnome-shell <arg choice="opt" rep="repeat">OPTION</arg></command>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>GNOME shell provides core user
+                interface functions for the GNOME 3 desktop, like switching
+                to windows and launching applications. GNOME shell takes
+                advantage of the capabilities of modern graphics hardware
+                and introduces innovative user interface concepts to provide
+                a visually attractive and easy to use experience.</para>
+
+                <para>gnome-shell is a required component of
+                the GNOME desktop, i.e. it is listed in the
+                RequiredComponents field of
+                <filename>/usr/share/gnome-session/sessions/gnome.session</filename>.
+                It is started in the window manager phase of the session.
+                </para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+
+                        <varlistentry>
+                                <term><option>-r</option>, <option>--replace</option></term>
+
+                                <listitem><para>Replace the running window manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-disable</option></term>
+
+                                <listitem><para>Disable connection to the session manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-client-id=<replaceable>ID</replaceable></option></term>
+
+                                <listitem><para>Specify session management <replaceable>ID</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-save-file=<replaceable>FILE</replaceable></option></term>
+
+                                <listitem><para>Initialize session from <replaceable>FILE</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--screen=<replaceable>SCREEN</replaceable></option></term>
+
+                                <listitem><para>X screen to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-d</option>, <option>--display=<replaceable>DISPLAY</replaceable></option></term>
+
+                                <listitem><para>X Display to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sync</option></term>
+
+                                <listitem><para>Make X calls synchronous</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Print version and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Display help and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--mode=<replaceable>MODE</replaceable></option></term>
+
+                                <listitem><para>Use a specific mode, e.g. "gdm" for login screen</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--list-modes</option></term>
+
+                                <listitem><para>List possible modes and exit</para></listitem>
+                        </varlistentry>
+
+                </variablelist>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Files</title>
+
+                <para>
+                        <filename>/usr/share/gnome-session/sessions/gnome.session</filename>,
+                        <filename>/usr/share/applications/gnome-shell.desktop</filename>.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+
+                <para>The bug tracker can be reached by visiting the
+                website <ulink url="https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell">https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell</ulink>.
+                Before sending a bug report, please verify that you have
+                the latest version of gnome-shell. Many bugs (major and
+                minor) are fixed at each release, and if yours is out of
+                date, the problem may already have been solved.</para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Additional Information</title>
+
+                <para>For further information, visit the website
+                <ulink url="http://live.gnome.org/GnomeShell">http://live.gnome.org/GnomeShell</ulink>.</para>
+        </refsect1>
+
+</refentry>

po/LINGUAS

@@ -34,6 +34,7 @@ kk
 kn
 ko
 ku
+ky
 lt
 lv
 ml

po/POTFILES.in

@@ -1,3 +1,5 @@
+data/50-gnome-shell-screenshot.xml.in
+data/50-gnome-shell-system.xml.in
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in
@@ -8,24 +10,25 @@ js/gdm/util.js
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
-js/ui/autorunManager.js
 js/ui/calendar.js
+js/ui/components/autorunManager.js
+js/ui/components/keyring.js
+js/ui/components/networkAgent.js
+js/ui/components/polkitAgent.js
+js/ui/components/recorder.js
+js/ui/components/telepathyClient.js
 js/ui/dash.js
 js/ui/dateMenu.js
 js/ui/endSessionDialog.js
 js/ui/extensionDownloader.js
 js/ui/extensionSystem.js
 js/ui/keyboard.js
-js/ui/keyringPrompt.js
 js/ui/lookingGlass.js
 js/ui/main.js
 js/ui/messageTray.js
-js/ui/networkAgent.js
 js/ui/notificationDaemon.js
 js/ui/overview.js
 js/ui/panel.js
-js/ui/placeDisplay.js
-js/ui/polkitAuthenticationAgent.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
 js/ui/screenShield.js
@@ -39,7 +42,6 @@ js/ui/status/lockScreenMenu.js
 js/ui/status/network.js
 js/ui/status/power.js
 js/ui/status/volume.js
-js/ui/telepathyClient.js
 js/ui/unlockDialog.js
 js/ui/userMenu.js
 js/ui/viewSelector.js