Bump version to 3.7.3.1

Update NEWS.

.gitignore

@@ -16,11 +16,16 @@ 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
+data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
+data/org.gnome.shell.evolution.calendar.gschema.xml
+data/org.gnome.shell.evolution.calendar.gschema.valid
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -33,6 +38,7 @@ docs/reference/*/*.txt
 docs/reference/*/*.types
 docs/reference/*/html/
 docs/reference/*/xml/
+docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
 intltool-extract.in
@@ -40,12 +46,14 @@ intltool-merge.in
 intltool-update.in
 libtool
 m4/
+man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot
 po/*.header
 po/*.sed
 po/*.sin
+po/.intltool-merge-cache
 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES
@@ -58,13 +66,17 @@ src/*-enum-types.[ch]
 src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
+src/calendar-server/evolution-calendar.desktop
+src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
 src/gnome-shell-extension-tool
+src/gnome-shell-extension-prefs
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
+src/gnome-shell-perf-tool
 src/gnome-shell-real
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
@@ -74,6 +86,8 @@ src/test-theme
 src/st.h
 src/stamp-st.h
 src/stamp-st.h.tmp
+src/st-scroll-view-fade-generated.c
+src/stamp-st-scroll-view-fade-generated.c
 stamp-h1
 tests/run-test.sh
 xmldocs.make

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/gvc"]
+	path = src/gvc
+	url = git://git.gnome.org/libgnome-volume-control

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	\
@@ -12,7 +16,9 @@ EXTRA_DIST =		\
 # These are files checked into Git that we don't want to distribute
 DIST_EXCLUDE =					\
 	.gitignore				\
+	.gitmodules				\
 	gnome-shell.doap			\
+	HACKING					\
 	MAINTAINERS				\
 	tools/build/*
 
@@ -20,4 +26,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,931 @@
+3.7.3.1
+=======
+* Revert 490206b to not depend on NMGTK-0.9.7, which hasn't been released yet
+
+3.7.3
+=====
+* Add 'No Messages' label when message tray is empty [Victoria; #686738]
+* Use better icons in Ctrl-Alt-Tab popup [Stéphane; #641303]
+* Show the OSK on the monitor where the focused window lives [Giovanni; #685856]
+* Highlight window clone and caption when hovered [Giovanni, Marc; #665310]
+* Improve login process indication [Stéphane; #687113]
+* Omit empty categories in apps view [Stéphane; #687970]
+* Style panel differently according to mode [Florian; #684573]
+* Make it possible to hide the user name [Matthias; #688577]
+* Consolidate and improve chat connection notifications [Giovanni; #687213]
+* Improve notification scrollbar appearance [Carlos; #688393]
+* Fade scroll view fade near scrolling edges [Jasper; #689249]
+* Add a read-only org.gnome.Shell.Mode property [Debarshi; #689300]
+* Don't close message tray after using context menus [Giovanni; #689296]
+* Port swipe-scrolling to ClutterPanAction [Jasper, Florian; #689062, #689552]
+* Remember state of 'Remember Password' checkbox [Ron; #688039]
+* Improve timestamp format in chat notifications [Carlos; #680989]
+* Improve style of missed-messages counter [Carlos; #686472]
+* Omit connection failure notifications if cancelled by user [Giovanni; #684823]
+* Add window-based Alt-Tab popup [Florian; #688913]
+* Support external session mode definitions [Florian; #689304]
+* Support session-mode-specific extensions [Florian; #689305]
+* Support 'parentMode' property in session modes [Florian; #689308]
+* Support a new org.gnome.ShellSearchProvider2 DBus interface
+  [Cosimo; #689735, #690009]
+* Add "windows" to Ctrl-Alt-Tab popup [Jasper; #689653]
+* Port PopupMenu to GrabHelper [Jasper; #689109, #689954]
+* Show headphone icon when headphones are plugged in [Giovanni; #675902]
+* Display (non-app) search results as list [Tanner, Cosimo; #681797]
+* Skip diacritical marks in search terms [Aleksander; #648587]
+* Expose all engine options in input sources [Giovanni, Rui; #682318]
+* Add input source switcher popup [Rui; #682315]
+* Add minimal support for InfiniBand in network menu [Dan; #677150]
+* Misc bug fixes and cleanups [Sebastian, Aleksander, Giovanni, Tim, Cosimo,
+  Florian, Matthias, Rui, Lionel, Colin, Piotr, Guillaume, Bastien, Tanner,
+  Carlos, Stéphane, Jakub; #688422, #688379, #688750, #688771, #686800,
+  #688133, #688895, #688966, #683986, #688004, #689108, #689029, #683449,
+  #688196, #689304, #689243, #689295, #689325, #689400, #679168, #689568,
+  #689537, #689528, #689749, #689789, #689353, #689820, #689868, #689778,
+  #689959, #688589, #688589, #689955, #687250, #689965, #690046, #690049,
+  #689884, #682286, #690173, #690174, #672941, #689876, #687881, #690171,
+  #690241, #690312, #690175, #687955, #650843, #688234, #690427
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Stéphane Démurget,
+  Guillaume Desmottes, Tanner Doshier, Piotr Drąg, Sebastian Keller,
+  Lionel Landwerlin, Tim Lunn, Victoria Martínez de la Cruz, Aleksander Morgado,
+  Florian Müllner, Bastien Nocera, Marc Plano-Lesay, Carlos Soriano Sánchez,
+  Jakub Steiner, Jasper St. Pierre, Colin Walters, Dan Winship, Ron Yorston
+
+Translations:
+  Yuri Myasoedov [ru], Wouter Bolsterlee [nl], Yaron Shahrabani [he],
+  Nilamdyuti Goswami [as], Ani Peter [ml], Kjartan Maraas [nb],
+  Dr.T.Vasudevan [ta], A S Alam [pa], Shankar Prasad [kn], Khaled Hosny [ar],
+  Daniel Mustieles [es], Dušan Kazik [sk]
+
+3.7.2
+=====
+* Enforce RTL in he for messages that might end up as LTR [Florian; #686630]
+* gdm: Move logo into the panel [Florian; #685852]
+* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* Tweak screenShield animations [Rui; #686745]
+* Restore Fittsability of summary items in message tray [Florian; #686474]
+* Save screencasts as recent item [Ray; #680647]
+* overview: Resize window captions on content change [Giovanni, Alex; #620874]
+* App search: Match GenericName too [Matthias; #687121]
+* runDialog: Better match style of other modal dialogs [Florian, Allan; #687127]
+* Improve the button insensitive style [Stéphane; #687110]
+* network: Don't use a global switch for all VPN connections [Giovanni; #682929]
+* appMenu: Update on icon theme changes [Florian; #687224]
+* Show 'Log out' in more situations [Matthias; #686736]
+* Add a setting to force the 'Log out' menuitem [Matthias; #686057]
+* overview: Improve styling of search box [Stéphane; #686479]
+* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
+* Show feedback notifications when user is busy [Stéphane; #662900]
+* Disable login button when there is no input [Stéphane; #687112]
+* Use non-linear overview shade for background [Giovanni, Pierre-Eric; #669798]
+* Reduce blocking in compositor thread [Simon, Jasper; #687465]
+* network: new country-specific type to gather providers [Aleksander; #687356]
+* Update man page [Matthias; #680601]
+* st-entry: Change the pointer cursor on enter/leave events [Thomas; #687130]
+* screenShield: Blur and desaturate the background [Giovanni, Cosimo; #682536]
+* Change height of chat notifications to have more context [Carlos; #665255]
+* screenShield: Account for motion velocity when hiding [Giovanni; #682537]
+* screenShield: hide the cursor while the lock screen is on [Giovanni; #682535]
+* Support remote search provider settings [Cosimo; #687491]
+* unlockDialog: Improve label of confirmation button [Stéphane; #687656]
+* userMenu: Rename "System Settings" item to "Settings" [Elad; #687738]
+* messageTray: Add keybinding to focus current notification [Stéphane; #652082]
+* Remove shell-screen-grabber [Neil; #685915]
+* main: Stop using Metacity's keybinding files [Florian; #687672]
+* Bluetooth: Remove ObexFTP functionality [Bastien; #688160]
+* a11y: Also set WM theme when HighContrast is switched on [Cosimo; #688256]
+* network: Rework multiple NIC support [Giovanni; #677142]
+* Rework keybindings to allow selective blocking/processing [Florian; #688202]
+* recorder: Show indicator on primary monitor [Adel; #688470]
+* recorder: Set frame duration to fix broken video headers [Adel; #688487]
+* Misc. bugfixes and cleanups [Florian, Jasper, Giovanni, Matthew, Stéphane,
+  Allan, Daiki, Owen, Alejandro, Jean-François, Cosimo, Sebastian, Adel, Alban;
+  #686484, #686728, #686805, #686574, #686763, #682428, #687132, #685239,
+  #687189, #687226, #658091, #670687, #687457, #687242, #687287, #687020,
+  #686583, #661194, #687491, #657315, #687958, #683986, #688089, #687708,
+  #686530, #684810, #688181, #688475, #688557, #688507, #638351]
+
+Contributors:
+  Elad Alfassa, Matthew Barnes, Alban Browaeys, Giovanni Campagna,
+  Cosimo Cecchi, Matthias Clasen, Allan Day, Stéphane Démurget,
+  Jean-François Fortin Tam, Adel Gadllah, Alex Hultman, Sebastian Keller,
+  Rui Matos, Simon McVittie, Aleksander Morgado, Florian Müllner,
+  Bastien Nocera, Pierre-Eric Pelloux-Prayer, Alejandro Piñeiro, Neil Roberts,
+  Sjoerd Simons, Carlos Soriano Sánchez, Jasper St. Pierre, Ray Strode,
+  Owen Taylor, Daiki Ueno, Thomas Wood
+
+Translations:
+  Dušan Kazik [sk], Pavol Klačanský [sk], Piotr Drąg [pl], Yuri Myasoedov [ru],
+  Marek Černocký [cs], Kjartan Maraas [nb], Wolfgang Stöggl [de],
+  Yaron Shahrabani [he], Fran Diéguez [gl], Mattias Põldaru [et]
+
+3.7.1
+=====
+* Add shortcut to open application view directly [Jeremy; #685738]
+* Expose '<Super>F10' shortcut in System Settings [Florian; #672909]
+* Clean up timestamp format in chat notifications [Carlos; #680989]
+* loginScreen: Add support for 'disable-restart-buttons' [Florian; #686247]
+* Update textures automatically on file changes [Florian; #679268]
+* Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
+* Add missing translations for GSetting schema [Giovanni; #686413]
+* Hide workspace switcher completely when it's not necessary [Seif; #686483]
+* Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
+* Port to GnomeIdleMonitor [Jasper; #682224]
+* Set Empathy as preferred handler when delegating channels [Xavier; #686296]
+* Allow testing GDM login dialog from the session [Giovanni; #683725]
+* Use all available space for windows in window picker [Jasper, Pierre-Eric;
+  #582650]
+* Use logind for suspend if available [Florian; #686482]
+* Misc. fixes and cleanups [Jasper, Florian, Adel, Rui; #677426, #680426,
+  #686233, #686241, #686318, #686240, #686484, #686002, #684650, #686487]
+
+Contributors:
+  Jeremy Bicha, Giovanni Campagna, Xavier Claessens, Adel Gadllah, Seif Lotfy,
+  Tim Lunn, Rui Matos, Florian Müllner, Pierre-Eric Pelloux-Prayer,
+  Carlos Soriano, Jasper St. Pierre
+
+Translations:
+  Andika Triwidada [id], Matej Urbančič [sl], Ihar Hrachyshka [be],
+  Daniel Mustieles [es], Fran Diéguez [gl], Takayuki KUSANO [ja],
+  Мирослав Николић [sr, sr@latin], Dušan Kazik [sk], Tom Tryfonidis [el]
+
+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]
+* Fix visibility of non-active workspaces during overview transition
+  [Florian; #682002]
+* Improve scrollbar theming [Cosimo; #682476]
+* Make sure the app menu remains hidden in locked state [Florian; #682475]
+* Add tooltip to show-applications icon [Jasper; #682445]
+* Do not add duplicate remote search providers [Florian; #682470]
+* Handle 'popup-menu' signal on summary items [Florian; #682486]
+* Fix dwelling during mouse-down [Owen; #682385]
+* Set label actor for endSessionDialog.ListItem [Alejandro; #677503]
+* Don't match on comments when searching applications [Florian; #682529]
+* Make workspace selector more similar to the mockup [Stefano; #662087]
+* Fix extension installation and reloading [Jasper; #682578]
+* Hide removable devices in the lock screen [Giovanni; #681143]
+* Reset cancellable after hitting Escape on login screen [Alban; #681537]
+* Fix suspend from the user menu [Giovanni; #682746]
+* Set label actor for summary items in message tray [Alejandro; #677229]
+* Set label for the "Show applications" dash button [Alejandro; #682366]
+* Load extensions as late as possible [Jasper; #682822]
+* Improve mount operation dialogs [Jon; #682645]
+* Remove "Connect to ..." item from places search [Florian; #682817]
+* Don't auto-expand notifications with actions [Giovanni; #682738]
+* Add a new lock screen menu to combine volume network and power
+  [Giovanni; #682540]
+* Add support for pre-edit to StIMText [Daiki; #664041]
+* Remove StIconType [Jasper, Florian, Rui, Giovanni, Debarshi; #682540]
+* Use monitor geometry for dwelling [Florian; #683044]
+* Add support for surrounding-text to StIMText [Daiki; #683015]
+* Improve the placement and style of the "No results" text [Jasper; #683135]
+* Remove broken network device activation policy [Giovanni; #683136]
+* Hide power status icon when no battery is present [Tim; #683080]
+* Ensure summary items are square and have spacing [Debarshi; #682248]
+* Fix close buttons overlapping screen edge [Debarshi; #682343]
+* Escape the tray when a legacy icon is clicked [Giovanni; #682244]
+* Update arrow in the screen shield to match latest mockups [Giovanni; #682285]
+* Allow lifting the screen shield with the mouse wheel [Giovanni; #683164]
+* Make sure to show the app menu after unlocking the screen [Jasper; #683154]
+* Misc bug fixes and cleanups [Debarshi, Florian, Giovanni, Jasper, Rui;
+  #582650, #667439, #682238, #682268, #682429, #682455, #682544, #682546,
+  #682683, #682710, #682998, #683073, #683137, #683156]
+
+Contributors:
+  Alban Browaeys, Giovanni Campagna, Cosimo Cecchi, Stefano Facchini,
+  Adel Gadllah, Tim Lunn, Rui Matos, William Jon McCann, Florian Müllner,
+  Alejandro Piñeiro, Debarshi Ray, Jasper St. Pierre, Owen Taylor, Daiki Ueno
+
+Translations:
+  Piotr Drąg [pl], Takayuki KUSANO [ja], Kjartan Maraas [nb],
+  Aurimas Černius [lt], Daniel Mustieles [es], Yuri Myasoedov [ru],
+  Khaled Hosny [ar], Yaron Shahrabani [he], Tom Tryfonidis [el],
+  Nilamdyuti Goswami [as], Fran Diéguez [gl], Nguyễn Thái Ngọc Duy [vi],
+  A S Alam [pa], Dr.T.Vasudevan [ta], Luca Ferretti [it]
+
+3.5.90
+======
+* Use symbolic icons for workspace switch OSD [Jon; #680738]
+* Lock screen improvements:
+  - Hide user menu and a11y menu in the screen lock [Giovanni; #681143]
+  - Bump the lock screen slightly when pressing a key [Giovanni; #681143]
+  - Constrain vertical movement of the screen shield [Giovanni; #681143]
+  - Return to lock screen on idle [Giovanni; #682041]
+  - Unlock screen automatically after fast-user switching [Giovanni; #682096]
+  - Fix "other user" label [Ray; #681750]
+* Constrain content of system modals to primary monitor [#681743]
+* Respect automatic lock setting on suspend/user-switch [Giovanni; #680231]
+* Improve styling of keyring prompt [Jasper; #681821]
+* Do not hard-code <super> as overlay-key [Florian; #665547]
+* Update style of attached modal dialogs [Florian; #681601]
+* a11y: allow navigation on non reactive items [Alejandro; #667439, #667439]
+* Implement mode-less overview design [Joost, Florian; #682109]
+* Implement message-tray redesign:
+  - Restyle the message tray [Ana, Allan, Florian; #677213, #682342]
+  - Move the desktop upwards when showing the tray [Debarshi; #681392]
+  - Add a close button to notifications [Ana, Jasper; #682253]
+  - Add a keybinding to toggle the tray [Debarshi; #681392]
+  - Make the tray keyboard navigable [Debarshi; #681519]
+  - Add dwelling at the bottom of the screen to open the tray [Owen; #682310]
+  - Don't time out banners when the user is inactive [Marina, Jasper]
+  - Misc fixes and cleanups [Jasper, Marina]
+* Fix showing "Next Week" on Sundays [Sebastian; #682198]
+* Delay restoring IM presence until the network comes up [Florian; #677982]
+* Display enterprise login hint [Ray; #681975]
+* Ignore unrecognized/irrelevant network devices/connections [Dan; #682364]
+* Misc bug fixes and cleanups: [Dan, Florian, Jasper, Jiro, Piotr, Rico;
+  #643687, #682045, #682189]
+
+Contributors:
+  Giovanni Campagna, Allan Day, Piotr Drąg, William Jon McCann,
+  Sebastian Keller, Jiro Matsuzawa, Florian Müllner, Alejandro Piñeiro,
+  Debarshi Ray, Ana Risteska, Jasper St. Pierre, Ray Strode, Owen Taylor,
+  Rico Tzschichholz, Joost Verdoorn, Dan Winship, Marina Zhurakhinskaya
+
+Translations:
+  Nilamdyuti Goswami [as], Daniel Mustieles [es], Yaron Shahrabani [he],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Tobias Endrigkeit [de], A S Alam [pa],
+  Sandeep Sheshrao Shedmake [mr], Fran Diéguez [gl],
+  Мирослав Николић [sr, sr@latin]
+
+3.5.5
+=====
+* Update style to match mockups [Allan]
+  - improve calendar layout and legibility
+  - update notifications and menus
+  - use a common style for entries
+  - update scrollbars to match GTK+
+  - improve clock/unlock button in lock screen
+  - update polkit dialogs [Jasper]
+* Fix login dialog growing when selecting different users [Florian; #675076]
+* Implement screen lock in the shell [Giovanni]
+  - restructure login code to be shared with session unlock [#619955]
+  - add initial screen shield / unlock dialog implementation [#619955]
+  - implement (optional) notification list on lock shield [#619955]
+  - update login dialog style to match lock screen [#619955]
+  - filter notifications to only show new ones on the screen lock [#681143]
+  - make notifications scrollable if necessary [#681143]
+  - use correct application names in notifications [#681143]
+  - allow to return to the shield by pressing Escape [#681143]
+* Minor login dialog improvements [Florian]
+  - update style to match the overall visuals [#660913]
+  - indicate whether users are logged in [#658185]
+* Add support for background-repeat CSS property [Jasper; #680801]
+* Add :active pseudo class on scroll handles [Florian]
+* Remove markup from translated strings [Matthias; #681270]
+* Misc bug fixes and cleanups: [Alban, Florian, Giovanni, Jasper, Jeremy,
+  Matthias, Piotr; #677893, #679944, #680064, #680170, #680216, #680426,
+  #681101, #681382]
+
+Contributors:
+  Jeremy Bicha, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Allan Day,
+  Piotr Drąg , Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Matej Urbančič [sl], Tom Tryfonidis [el], Yaron Shahrabani [he],
+  Kjartan Maraas [nb], Baurzhan Muftakhidinov [kk], Praveen Illa [te],
+  Khaled Hosny [ar], Daniel Mustieles [es], Gabor Kelemen [hu],
+  Fran Diéguez [gl], Sweta Kothari [gu], Aleksej Kabanov [ru],
+  Nilamdyuti Goswami [as], Arash Mousavi [fa], Мирослав Николић [sr, sr@latin]
+
+3.5.4
+=====
+* Fix wrong result handling of remote calls [Florian; #678852]
+* dateMenu: Fix regression that caused no date to be displayed [Colin]
+* WindowTracker: Fix refcounting bug in get_app_for_window() [Giovanni; #678992]
+* Show the workspace switcher for move-to-workspace keybinding
+  [Giovanni, Jasper; #674104, #660839, #679005]
+* userMenu: Move "Power off" item to the bottom [Florian; #678887]
+* Remove contacts search provider [Florian, Rui; #677442]
+* network: don't ask for always-ask secrets when interaction isn't allowed
+  [Dan; #679091]
+* PolkitAgent: Look for the right password prompt [Matthias; #675300]
+* Implement extension updates [Jasper; #679099]
+* userMenu: Don't disconnect account signals when disabled [Guillaume; #669112]
+* Fix startup notification when opening calendar [Florian; #677907]
+* networkAgent: use absolute path if configured [Clemens; #679212]
+* recorder: Port to GStreamer-1.0 API [Florian; #679445]
+* telepathyClient: don't add log messages on presence changes [Ana; #669508]
+* lookingGlass: Don't use a signal callback on 'paint' to draw the border
+  [Jasper; #679464]
+* Add support for inhibiting automount [Hans; #678597]
+* Implemented banner support for the login screen [Matthias, Marius; #665346]
+* boxpointer: Flip side if we would end outside the monitor [Rui; #678164]
+* boxpointer: Change 'animate' parameter on show/hide to a bitmask
+  [Rui; #678337]
+* Add a grayscale effect [Matthias, Jasper, Florian: #676782, #674499]
+* UserMenu: show "Install Updates & Restart" when appropriate
+  [Giovanni; #677394, #680080]
+* messageTray: don't show the message tray when a new notification is shown
+  [Ana; #677210]
+* panel: don't break when indicator has no menu [Jean-Philippe; #678694]
+* appMenu: Disable app menu during startup animations [Florian; #672322]
+* autorun: Add a notification when unmounting drives [Cosimo; #676125]
+* st-icon: Fix potential crash involving shadows [Jasper; #679776]
+* Remove manual garbage collection on tweeners end [Cosimo; #679832]
+* dash: hide tooltips when overview begins hiding [Stefano; #674241]
+* Update modal dialog animation for new centered position [Florian; #674499]
+* calendar: Fix grid lines in RTL locales [Florian; #679879]
+* Integrate IBus with keyboard indicator [Rui; #641531]
+* Move ibus status icon under keyboard [Matthias]
+* gdm: port from libgdmgreeter to libgdm [Ray; #676401]
+* Misc bug fixes and cleanups [Antoine, Cosimo, Giovanni, Jasper, Rico;
+  #678978, #672790, #679847, #679944]
+
+Contributors:
+ Jean-Philippe Braun, Clemens Buchacher, Giovanni Campagna, Cosimo Cecchi,
+ Matthias Clasen, Hans de Goede, Guillaume Desmottes, Stefano Facchini,
+ Antoine Jacoutot, Rui Matos, Florian Müllner, Marius Rieder, Ana Risteska,
+ Jasper St. Pierre, Rico Tzschichholz, Colin Walters, Dan Williams
+
+Translations:
+ Matej Urbančič [sl], Khaled Hosny [ar], Nguyễn Thái Ngọc Duy [vi],
+ Nilamdyuti Goswami [as], Alexander Shopov [bg], Ivaylo Valkov [bg],
+ Daniel Mustieles [es], Kjartan Maraas [nb,nn], Yaron Shahrabani [he],
+ Nilamdyuti Goswami [as], Chao-Hsiung Liao [zh_HK, zh_TW], Ihar Hrachyshka [be],
+ Praveen Illa [te]
+
+3.5.3
+=====
+* calendar: Adapt to Evolution-Data-Server API changes [Matthew; #677402]
+* messageTray: Don't show non urgent notifications while in fullscreen
+  [Adel; #677590]
+* modalDialog: show dialogs on monitor with the mouse pointer [Tim; #642591]
+* extensionSystem: Prepare for extension updating system [Jasper; #677586]
+* appDisplay: Don't show apps in NoDisplay categories in the All view
+  [Jasper; #658176]
+* st: Trigger theme updates on resolution changes [Florian; #677975]
+* Always enable a11y [Bastien; #678095]
+* telepathyClient: ignore invalidated channels [Guillaume; #677457]
+* shell-app: Update app menu if necessary [Florian; #676238]
+* Enable the Screen Reader menu item [Matthias; #663256]
+* Disable unredirection when a modal operation is active [Giovanni]
+* Make folks optional [Colin]
+* Improve mount-operation support [Cosimo]
+  - Fix exception when showing password entry [#678428]
+  - Close the password entry on operation abort [#673787]
+  - autorun: Don't allow autorun for things we mount on startup [#660595]
+  - Turn passphrase prompt into a dialog [#674962]
+  - Implement org.Gtk.MountOperationHandler [#678516]
+* Network menu improvements
+  - Sort Wifi networks by strength [Giovanni; #658946]
+  - Prefer wifi/3g over VPN in the panel [Cosimo; #672591]
+* clock: Switch to using GnomeWallClock [Colin; #657074]
+* remoteSearch: Allow to reference .desktop file for Title/Icon
+  [Florian; #678816]
+* Fix memory leaks [Jasper, Pavel; #678079, #678406, #678737]
+* Misc fixes [Florian, Giovanni, Guillaume, Jasper, Kjartan, Piotr, Rui;
+  #658955, #677497, #678396, #678502]
+* Misc cleanups [Bastien, Florian, Jasper; #677426, #677515, #678096, #678416]
+
+Contributors:
+ Matthew Barnes, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
+ Guillaume Desmottes, Piotr Drąg, Adel Gadllah, Tim L, Kjartan Maraas,
+ Rui Matos, Florian Müllner, Bastien Nocera, Jasper St. Pierre, Colin Walters
+
+Translations:
+ Matej Urbančič [sl], Yuri Kozlov [ru], Tom Tryfonidis [el],
+ Kjartan Maraas [nb], Žygimantas Beručka [lt], Luca Ferretti [it],
+ Khaled Hosny [ar], Daniel Mustieles [es], Fran Diéguez [gl], A S Alam [pa]
+
+3.5.2
+=====
+* main: Move 'toggle-recording' binding into the shell [Florian; #674377]
+* popupMenu: make sure to break the grab when the slider is not visible
+  [Stefano; #672713]
+* st-theme-node-drawing: Don't use GL types [Neil; #672711]
+* Mirror Evolution calendar settings into our own schema [Owen; #674424]
+* shell-network-agent: don't crash if a request isn't found [Dan; #674961]
+* notificationDaemon: Match app based on WM_CLASS [Jasper; #673761]
+* NetworkMenu: use network-offline while loading [Giovanni; #674426]
+* lookingGlass: Remove the Errors tab [Jasper; #675104]
+* searchDisplay: Reset keyboard focus after displaying async results
+  [Rui; #675078]
+* gdm: don't fail if fprintd is unavailable [Ray; #675006]
+* messageTray: Fix scrolling up [Jasper; #661615]
+* main: Close the recorder instead of pausing it [Rui; #675128]
+* Accessibility [Alejandro]
+  - Use the proper label_actor for date menu on top panel [#675307]
+  - Set the proper role/label_actor for SearchResult.content [#672242]
+  - do not expose a label text if 'hidden' style class is used [#675341]
+* Magnifier: Add brightness and contrast functionality [Joseph; #639851]
+* theme: use a smaller border-radius for top bar [Jakub; #672430]
+* placeDisplay: use new bookmark file location [Matthias; #675443]
+* port all synchronous search providers to the async API [Jasper, Rui; #675328]
+* NetworkAgent: disallow multiple requests for the same connection/setting
+  [Giovanni; #674961]
+* userMenu: Update to latest mockups [Florian; #675802]
+* util: Don't double-fork when spawning from Alt-F2 [Colin; #675789]
+* messageTray: Make Source usable without subclassing [Jasper; #661236]
+* panel: Check for appMenu button's reactivity before opening [Florian; #676316]
+* Fix formatting of bluetooth passkey [Florian; #651251]
+* notificationDaemon: Filter out file-transfer notifications [Jasper; #676175]
+* Don't use global.log() [Jasper; #675790]
+* Fix broken extension loading in some distributions [Owen, Alexandre; #670477]
+* shell-app: Raise windows in reverse order to preserve the stacking
+  [Rui; #676371]
+* Generalize gdm-mode [Florian; #676156]
+* Switch string formatting to the one inside gjs [Jasper; #675479]
+* extensionUtils: Support subdirectories in getCurrentExtension
+  [Jasper; #677001]
+* panel: Refuse to add (legacy) status icons not part of the session mode
+  [Florian; #677058]
+* Add an initial-setup mode [Matthias; #676697]
+* status/keyboard: Port to the new input sources settings [Rui; #641531]
+* NetworkMenu: show notifications for failed VPN connections [Giovanni; #676330]
+* userMenu: Indicate progress on status changes [Florian; #659067]
+* recorder: Honor "disable-save-to-disk" lockdown key [Rūdolfs; #673630]
+* searchDisplay: Use the rowLimit we pass to the IconGrid [Christian; #675527]
+* endSessionDialog: Factor out _updateDescription from _updateContent
+  [Alejandro; #674210]
+* Fix empathy's appMenu freezing the shell [Alban; #676447]
+* Code cleanups [Florian, Giovanni, Jasper; #672807, #672413, #676837, #676850,
+  #672272]
+* Misc bug fixes [Alban, Florian, Giovanni, Guillaume, Jasper, Piotr, Rico,
+  Ron, Rui, Stefano; #659968, #672192, #673177, #673198, #674323, #675301,
+  #675370, #676347, #676806, #677097]
+
+Contributors:
+ Alban Browaeys, Giovanni Campagna, Matthias Clasen, Guillaume Desmottes,
+ Piotr Drąg, Stefano Facchini, Rui Matos, Rūdolfs Mazurs, Florian Müllner,
+ Alejandro Piñeiro, Neil Roberts, Alexandre Rostovtsev, Joseph Scheuhammer,
+ Jakub Steiner, Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz,
+ Colin Walters, Dan Winship, Ron Yorston
+
+Translations:
+ OKANO Takayoshi [ja], Daniel Mustieles [es], Changwoo Ryu [ko],
+ Yaron Shahrabani [he], Fran Diéguez [gl], Jonh Wendell [pt_BR],
+ Kjartan Maraas [nb], Luca Ferretti [it], Tom Tryfonidis [el],
+ Sandeep Sheshrao Shedmake [mr], Takanori MATSUURA [ja], Dirgita [id],
+ Mantas Kriaučiūnas [lt], Matej Urbančič [sl], Jiro Matsuzawa [ja]
+
+3.4.1
+=====
+* Fix crash that occurred when an icon theme change caused unexpected
+  reentrancy in the icon loading code [Jasper; #673512]
+* Don't show system and other disabled users in the GDM user list
+  [Adel; #673784]
+* Make gnome-shell-calendar-server initialize GTK+ so it can display
+  password prompts if needed [#673608; Owen, Rico]
+* Adapt to Mutter API change for keybinding addition [Florian; #673014]
+* Fix crash when an extension was installed as both a user extension
+  and a system extension [#673613; Jasper]
+* Fix bug where chat entry could end up partially offscreen [Joost, 661944]
+* Fix problem where icons weren't updating when theme was changed
+  [#672941; Florian]
+* Look for Evolution calendar settings in GSettings, not GConf [#673610; Owen]
+* Add <super>F10 for the application menu [#672909; Florian]
+* Fix %Id format characters to work in translations [#673106; Cosimo]
+  (were already used in fa translation)
+* Fix error when NetworkManager restarts [#673043; Giovanni]
+* Improve efficiency of overview redraws by working around Clutter issue
+  [Stefano; #670636]
+* Misc bug fixes [Florian, Giovanni, Jasper, Rui, Stefano;
+  #672592, #672641, #672719, #673187, #673233, #673656]
+
+Contributors:
+ Giovanni Campagna, Cosimo Cecchi, Stefano Facchini, Adel Gadllah, Rui Matos,
+ Florian Müllner, Jasper St. Pierre, Owen Taylor, Rico Tzschichholz,
+ Joost Verdoorn
+
+Translations:
+ Khaled Hosny [ar], Ihar Hrachyshka [be], Alexander Shopov [bg], Gil Forcada,
+ Jordi Serratosa [ca], Petr Kovar [cs], Bruce Cowan [en_GB],
+ Carles Ferrando [ca@valencia], Wolfgang Stöggl [de], Daniel Mustieles [es],
+ Arash Mousavi [fa], Bruno Brouard [fr], Fran Diéguez [gl],
+ Sweta Kothari [gu], Yaron Shahrabani [he], Gabor Kelemen [hu],
+ Shankar Prasad [kn], Žygimantas Beručka [lt], Rudolfs Mazurs [lv],
+ Sandeep Sheshrao Shedmake [mr], Kjartan Maraas [nb], Piotr Drąg [pl],
+ Yuri Myasoedov [ru], Daniel Nylander [se], Matej Urbančič [sl],
+ Miroslav Nikolić [sr], Sasi Bhushan, Praveen Illa [te], Yinghua Wang [zh_CN]
+
+3.4.0
+=====
+* Don't crash when taking screenshots [Jasper; #672775]
+* Fix dialog-resizing problem [Florian; #672543]
+
+Contributors:
+ Florian Müllner, Jasper St. Pierre
+
+Translations:
+ Khaled Hosny, Abderrahim Kitouni [ar], Ihar Hrachyshka [be],
+ Alexander Shopov [bg], Marek Černocký [cs], Jiri Grönroos, Timo Jyrinki [fi],
+ Bruno Brouard [fr], Fran Diéguez [gl], Yaron Shahrabani [he],
+ Gabor Kelemen [hu], Jiro Matsuzawa [ja], Kenneth Nielsen [dk],
+ Mattias Põldaru [et], Changwoo Ryu [ko], Rudolfs Mazurs [lv],
+ Jonh Wendell [pt_BR], Yuri Myasoedov[ru], Daniel Korostil [uk],
+ Nguyễn Thái Ngọc Duy [vi], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.92
+======
+* Add shell-dialogs for GNOME Keyring prompts [Stef; #652459, #652460, #671034]
+* When the user returns from idle, bring up the message tray if there were
+  messages while they were away [Marina; #643014]
+* https://live.gnome.org/EveryDetailMatters
+  - Make the workspace thumbnails clickable all the way to the edge of the
+    screen [Stefano; #643319]
+  - Don't slide out the workspace thumbnails if the mouse is over them when
+    entering the overview [Joost, #651092]
+  - Fix placeholder jumps while dragging a dash item [Joost; #651842]
+  - Don't favorite apps if they are dropped back at the same position
+    [Jean-Philippe; #656333]
+  - To avoid confusion, don't allow removing running apps from favorites
+    [Florian; #644853]
+  - Fix creation of new workspaces by dragging application launchers
+    [Stefano; #664202]
+  - Make it easier to drag dash items without triggering the menu
+    [Florian; #637103]
+* Accessibility [Alejandro]
+  - Add StWidget API for easily adding accessible states and setting roles,
+    names [#668366, #667432, #671378]
+  - Set accessibility information on UI elements
+    [#644255, #667432, #668361, #672047, #670308, #670312, #670719, #671404]
+* Improve key-navigation in the overview [Rui, Florian; #663901]
+* Key navigation bug fixes [Rui, Florian; #662493, #663437, #665215, #671998]
+* Honor a 'org.gnome.shell.overrides.dynamic-workspaces' setting that
+  determines whether the workspace count is dynamic and unsaved in GSettings
+  or static and saved. [Florian; #671568]
+* Avoid saving user presence to GSettings when not necessary
+  [Florian; #665701, #668214]
+* Save screencasts in the users Videos/ directory [Adel; #670749]
+  Use a "human readable" filename [Florian, Adel, Ray; #670753]
+* Allow dragging from the empty part of the top panel to unmaximize a window
+  [Florian; #666359]
+* Fix hangs that could occur when switching away to a VT [Ray; #653833]
+* Fix problems with installing from extensions.gnome.org [Giovanni; #671134]
+* Fix locking the screen when suspending via menu [David, Gert; #670820]
+* Fix browser plugin with Konqueror and Opera [Jasper]
+* Fix shell restart not to bring up failure screen [Giovanni; #648384]
+* Reorganize and clean up CSS theming [Allan; #668209]
+* Improve appearance of modal dialogs [Allan, Florian; #670227, #668209]
+* Update the calendar code to use ECalClient [Giovanni; #671177]
+* Update jhbuild script to use the main moduleset [Owen, Will; #668440]
+* StTextureCache: code cleanup, evict unused icons, merge together
+  simulataneous requests for the same icon [Jasper; #670771, #671656, #672273]
+* Clean up St for recent Clutter changes and fix bugs. StContainer and
+  StGroup are removed [Jasper, Florian; #670034, #670640, #670904]
+* Code cleanup [Adel, Jasper, Rui; #613194, #671086, #671103]
+* Misc bug fixes
+  [Adel, Colin G, Cosimo, Florian, Giovanni, Jasper, Marius, Rui, Stefano;
+  #651130, #658946, #667552, #670076, #671001, #670979, #671410, #671411,
+  #671556, #671656, #671657, #672011, #672024, #672240, #672265, #672270,
+  #672321, #672326, #672413, #672471]
+
+Contributors:
+ Jean-Philippe Braun, Giovanni Campagna, Cosimo Cecchi, Allan Day,
+ Stefano Facchini, David Foerster, Adel Gadllah, Marius Gedminas,
+ Colin Guthrie, Gert Michael Kulyk, William Lachance, Rui Matos,
+ Florian Müllner, Alejandro Piñeiro, Jan Alexander Steffens,
+ Jasper St. Pierre, Ray Strode, Owen Taylor, Joost Verdoorn, Stef Walter,
+ Marina Zhurakhinskaya
+
+Translations:
+ Nilamdyuti Goswami [as], Ihar Hrachyshka, Kasia Bondarava [be],
+ Alexander Shopov, Ivaylo Valkov [bg], Gil Forcada [ca], Marek Černocký [cs],
+ Mario Blättermann [de], Kris Thomsen [dk], Bruce Cowan [en_GB],
+ Kristjan Schmidt [eo], Daniel Mustieles [es], Mattias Põldaru [et],
+ Inaki Larranaga Murgoitio [eu], Arash Mousavi [fa], Timo Jyrinki [fi],
+ Bruno Brouard [fr], Fran Diéguez [gl], Sweta Kothari [gu],
+ Yaron Shahrabani [he], Gabor Kelemen [hu], Jiro Matsuzawa [ja],
+ Baurzhan Muftakhidinov [kk], Seong-ho Cho [ko], Žygimantas Beručka [lt],
+ Anita Reitere [lv], Anish A, Praveen Arimbrathodiyil, Mohammed Sadiq [ml],
+ fKjartan Maraas [nb], Wouter Bolsterlee [nl], A S Alam [pa], Piotr Drąg [pl],
+ Duarte Loreto [pt], Jonh Wendell [pt_BR], Yuri Myasoedov [ru],
+ Matej Urbančič [sl], Miroslav Nikolić [sr], Tirumurti Vasudevan [ta],
+ Sasi Bhushan, Krishnababu Krothapalli [te], Daniel Korostil [uk],
+ Nguyễn Thái Ngọc Duy [vi], YunQiang Su, Yinghua Wang [zh_CN],
+ Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.90
+======
+
+* Allow other applications to implement search providers via D-Bus
+  [Florian; #663125, #670148]
+* Remove "Recent Items" search, as replaced by Documents search
+  [Florian; #663125]
+* Allow NetworkManager VPN plugins to use a shell-themed dialog
+  [Giovanni; #658484]
+* Port away from deprecated Clutter API [Jasper, Florian, Adel; #670034]
+  - StTooltip is removed
+  - StWidget is now a concrete class and can be instantiated
+  - st_container_destroy_children(), st_box_layout_insert_actor(),
+    and other functions removed in favor of new replacements in Clutter.
+* Use systemd for console/session handling when available [Lennart]
+* Visual improvements to contact search, padding, top panel, checkboxes
+  [Allan, Florian, Jakub; #669489, #669811, #669993]
+* Add a include_cursor parameter to Screenshot and ScreenshotWindow
+  D-Bus methods [Adel; #670086]
+* Add a "FlashArea" D-Bus method to do the screenshot flash without a
+  screenshot [Adel; #669660]
+* Build fixes [Adel, Giovanni, Jasper; #658484, #669637]
+* Misc bug fixes [Adel, Florian, Giovanni, Guillaume, Jasper, Jeff,
+  Marc-Antoine, Stef, Stefano, Will; #642135, #658484, #658908, #667694,
+  #669098, #669921, #669662, #669694, #669776, #669887, #669921, #670005,
+  #670006, #670319, #670418, #670489]
+
+Contributors:
+ Giovanni Campagna, Cosimo Cecchi, Allan Day, Guillaume Desmottes, Jeff Epler,
+ Stefano Facchini, Adel Gadllah, Florian Müllner, Marc-Antoine Perennou,
+ Jasper St. Pierre, Lennart Poettering, Jakub Steiner, Jasper St. Pierre,
+ Will Thompson, Stef Walter
+
+Translations:
+ Ihar Hrachyshka [be], Marek Černocký, Adam Matoušek [cs],
+ Kenneth Nielsen [dk], Daniel Mustieles [es], Mattias Põldaru [et],
+ Fran Diéguez [gl], Yaron Shahrabani [he], Luca Ferretti [it],
+ Baurzhan Muftakhidinov [kk], Aurimas Černius [lt], Kjartan Maraas [nb],
+ A S Alam [pa], Matej Urbančič [sl], Miroslav Nikolić [sr],
+ Praveen Illa [te], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.5
+=====
+
+* Extension system: [Jasper; #668429]
+  http://blog.mecheye.net/2012/02/more-extension-api-breaks/
+ - Add a 'gnome-shell-extension-prefs' application for displaying extension
+   preferences as provided by the extension in a prefs.js file.
+ - Allow launching gnome-shell-extension-prefs from extensions.gnome.org
+   throuhg the browser plugin.
+ - Add ExtensionUtils.getCurrentExtension() for an extension to get a
+   handle to an extension object, to get local imports or paths.
+ - Add an onshellrestart callback to the browser plugin [Jasper; #668517]
+* Screenshots:
+  - Move the screenshot "flash" to the shell [Cosimo; #668618]
+  - Move saving screenshots to a thread [Adel; #652952]
+  - Correctly screenshot rounded decorations [Jasper; #662486]
+* Screen recorder:
+  - Change the default pipeline to favor speed over quality [Owen; #669066]
+  - Drop frames to keep from running the user out of memory [Owen; #669066]
+* Work around a slow implementation of glReadPixels() in the Intel drivers,
+  improving performance for screenshots and the screen recorder.
+  [Owen; #669065]
+* Use Keywords: field in desktop files when search for applications
+  [Florian; #609702]
+* Strip debian- when matching desktop file names [Jasper; #665647]
+* Fix up various problems from CSS background size-addition
+  [Florian, Jasper; #668430, #633462]
+* UI tweaks and behavior fixes
+  [Florian, Giovanni, Stefano; #643867, #666197, #664622]
+* Some improvements to exported accessibility information  [Alejando; #667376]
+* Don't show contacts without IM information as offline [Florian; #662685]
+* Don't change status from hidden to extended_away when going idle
+  [Florian; #642408]
+* Cleanups [Emmanuele, Jasper; #662152, #669239]
+* Misc bug fixes [Cosimo, Dan, Florian, Jasper, Rui, Stefano;
+  #633462, #643867, #662213, #662386, #662747, #665000, #665017, #665322,
+  #667371, #667860, #668020, #668517, #668541, #669236]
+
+Contributors:
+ Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Stefano Facchini,
+ Adel Gadllah, Rui Matos, Florian Müllner, Alejandro Piñeiro,
+ Jasper St. Pierre, Owen Taylor, Dan Winship
+
+Translations:
+ Daniel Mustieles [es], Timo Jyrinki [fi], Seán de Búrca [ga],
+ Fran Diéguez [gl], Kjartan Maraas [nb], Wouter Bolsterlee [nl],
+ Danishka Navin [si], Yaron Shahrabani [he], Matej Urbančič [sl],
+ Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.4
+=====
+* https://live.gnome.org/EveryDetailMatters
+  - Add "browse" for labels for dash items - once a tooltip is
+    showing, switch to other items without a delay [Seif; #666170]
+  - Always scale down windows in the overview at least to 70% [Vit; #646704]
+  - Fix the new-workspace drop indicator sometimes getting stuck
+    [Stefano; #664201]
+  - Delay rearranging windows in the overview as long as the pointer
+    is over a window [Vit; #645325]
+* Add a GConf => DConf migration file for overriden Mutter settings
+  [Florian; #667636]
+* When a VPN connection is active, show that as the network icon
+  [Giovanni; #665115]
+* Handle the "ExtendedAway" IM status as away, not offline [Guillaume; #667813]
+* Improve the appearance of the labels in "Applications" [Alex; #642392]
+* Adjust for GTK+ and Mutter API changes for application menu [Ryan; #668118]
+* Add section label support to the application menu [Giovanni; #666681]
+* Fix screenshot methods to work again [Cosimo; #667662]
+* Fix several crashers related to updating workspace thumbnails [Owen; #667652]
+* Fix memory management error causing gnome-shell-hotplug-sniffer to crash
+  [Owen; #667378]
+* Build fixes [Emmanuele, Rico; #667864]
+* Code cleanups [Adel; #668087]
+* Misc bug fixes [Colin, Florian, Giovanni, Owen, Xavier; #633028, #658817,
+  #664138, #667881, #668048, #668050]
+
+Contributors:
+ Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Xavier Claessens,
+ Guillaume Desmottes, Stefano Facchini, Adel Gadllah, Alex Hultman,
+ Ryan Lortie, Seif Lotfy, Florian Müllner, Vit Stanislav, Owen Taylor,
+ Rico Tzschichholz, Colin Walters
+
+Translations:
+ Ihar Hrachyshka [be], Alexander Shopov [bg], Arash Mousavi [fa],
+ Jiri Grönroos, Timo Jyrinki [fi], Fran Diéguez [gl], Kjartan Maraas [nb],
+ Yuri Myasoedov [ru], Matej Urbančič [sl], Nguyễn Thái Ngọc Duy [vi]
+
+3.3.3
+=====
+* https://live.gnome.org/EveryDetailMatters
+  - Stop flashing the window labels on actions in overview [Zan; #644861]
+  - Improve the look of window captions in the overview [Marc; #664487]
+  - Move dash tooltips beside the icon [Seif, Stefano; #666166]
+* Support application menus exported from applications via new GLib API
+   and D-Bus protocol. [Giovanni, Colin, Matthias, Cosimo]
+* For removable device prompts, show "Open with Rhythmbox], rather
+  than "Open with Rhythmbox Music Player' [Florian; #664561]
+* Switch to activating the message tray only with a hot corner rather
+  than a full row of pixels, allowing mouse events to apps [Rui; #663366]
+* Fully handle the case where the workspaces-only-on-primary
+  GSetting is set to false [Florian; #652580]
+* Add support for background-size CSS property to St [Quentin; #633462]
+* Port to new GJS Lang.Class framework [Giovanni; #664436]
+* Finish port to GDBus [Giovanni; #664436]
+* Stop using the deprecated Clutter default stage [Florian, Jasper; #664052]
+* Fix bugs that kept browser plugin from working in WebKit-based browser
+  [Jasper; #666444]
+* Fix typo that made uninstalling extensions not work [Jasper]
+* Fix crash in browser plugin if shell is not run [Jürg]
+* Reintroduce piscine paschal ovum [Giovanni; #666606]
+* Network menu bug fixes
+  Giovanni; #664124, #665194, #665680, #666429, #666614]
+* Misc bug fixes [Florian, Jasper, Jonny, Marina, Ron; #647587, #659272,
+  #664138, #665261, #666020, #666243]
+* Build fixes [Owen]
+
+Contributors:
+ Jürg Billeter, Giovanni Campagna, Stefano Candori, Cosimo Cecchi,
+ Matthias Clasen, Zan Dobersek, Quentin Glidic, Jonny Lamb, Ryan Lortie,
+ Seif Lotfy, Rui Matos, Florian Müllner, Bastien Nocera, Jasper St. Pierre,
+ Marc Plano-Lesay, Owen Taylor, Colin Walters, Ron Yorsten,
+ Marina Zhurakhinskaya
+
+Translations:
+ Petr Kovar [cs], Kris Thomsen [dk], Daniel Mustieles [es],
+ Ville-Pekka Vainio [fi], Yaron Shahrabani [he], Luca Ferretti [it],
+ Hideki Yamane [ja], Žygimantas Beručka [lt], Jovan Naumovski [mk],
+ Kjartan Maraas [nb], "Andreas N" [nn], Lucian Adrian Grijincu [ro],
+ Matej Urbančič [sl], Praveen Illa [te], Muhammet Kara [tr],
+ Daniel Korostil [uk], Aron Xu [zh_CN]
+
 3.3.2
 =====
 * Port D-Bus usage in the shell to GDBus [Giovanni, Marc-Antoine, Florian,
@@ -154,7 +1082,7 @@ Contributors:
 Translations:
  Friedel Wolff [af], Nilamdyuti Goswami [as], Ihar Hrachyshka [be],
  Ivaylo Valkov [bg], Gil Forcada [ca], Carles Ferrando [ca@valencia],
- Petr Kovar [cz], Mario Blättermann [de], Kris Thomsen [dk],
+ Petr Kovar [cs], Mario Blättermann [de], Kris Thomsen [dk],
  Tiffany Antopolski, Kristjan Schmidt [eo], Daniel Mustieles [es],
  Inaki Larranaga Murgoitio [eu], Tommi Vainikainen [fi], Bruno Brouard [fr],
  Fran Dieguez [gl], Yaron Shahrabani [he], Gabor Kelemen [hu],

autogen.sh

@@ -13,6 +13,14 @@ PKG_NAME="gnome-shell"
     exit 1
 }
 
+# Fetch submodules if needed
+if test ! -f src/gvc/Makefile.am;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from GNOME Git (or from"
     echo "your OS vendor's package manager)."

browser-plugin/browser-plugin.c

@@ -41,7 +41,7 @@
       "It can be used only by extensions.gnome.org"
 #define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";
 
-#define PLUGIN_API_VERSION 1
+#define PLUGIN_API_VERSION 5
 
 typedef struct {
   GDBusProxy *proxy;
@@ -104,7 +104,7 @@ check_origin_and_protocol (NPP instance)
                           &location))
     goto out;
 
-  if (!NPVARIANT_IS_OBJECT (document))
+  if (!NPVARIANT_IS_OBJECT (location))
     goto out;
 
   hostname = get_string_property (instance,
@@ -161,6 +161,7 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
   plugin->newp = NPP_New;
   plugin->destroy = NPP_Destroy;
   plugin->getvalue = NPP_GetValue;
+  plugin->setwindow = NPP_SetWindow;
 
   return NPERR_NO_ERROR;
 }
@@ -222,7 +223,7 @@ NPP_New(NPMIMEType    mimetype,
                                                NULL, /* interface info */
                                                "org.gnome.Shell",
                                                "/org/gnome/Shell",
-                                               "org.gnome.Shell",
+                                               "org.gnome.Shell.Extensions",
                                                NULL, /* GCancellable */
                                                &error);
   if (!data->proxy)
@@ -262,11 +263,14 @@ NPP_Destroy(NPP           instance,
 /* =================== scripting interface =================== */
 
 typedef struct {
-	NPObject     parent;
+  NPObject     parent;
-	NPP          instance;
+  NPP          instance;
-	GDBusProxy  *proxy;
+  GDBusProxy  *proxy;
-	NPObject    *listener;
+  GSettings   *settings;
-	gint         signal_id;
+  NPObject    *listener;
+  NPObject    *restart_listener;
+  gint         signal_id;
+  guint        watch_name_id;
 } PluginObject;
 
 static void
@@ -284,7 +288,7 @@ on_shell_signal (GDBusProxy *proxy,
       gint32 status;
       gchar *error;
       NPVariant args[3];
-      NPVariant result;
+      NPVariant result = { NPVariantType_Void };
 
       g_variant_get (parameters, "(sis)", &uuid, &status, &error);
       STRINGZ_TO_NPVARIANT (uuid, args[0]);
@@ -300,6 +304,28 @@ on_shell_signal (GDBusProxy *proxy,
     }
 }
 
+static void
+on_shell_appeared (GDBusConnection *connection,
+                   const gchar     *name,
+                   const gchar     *name_owner,
+                   gpointer         user_data)
+{
+  PluginObject *obj = (PluginObject*) user_data;
+
+  if (obj->restart_listener)
+    {
+      NPVariant result = { NPVariantType_Void };
+
+      funcs.invokeDefault (obj->instance, obj->restart_listener,
+                           NULL, 0, &result);
+
+      funcs.releasevariantvalue (&result);
+    }
+}
+
+#define SHELL_SCHEMA "org.gnome.shell"
+#define ENABLED_EXTENSIONS_KEY "enabled-extensions"
+
 static NPObject *
 plugin_object_allocate (NPP      instance,
                         NPClass *klass)
@@ -309,9 +335,18 @@ plugin_object_allocate (NPP      instance,
 
   obj->instance = instance;
   obj->proxy = g_object_ref (data->proxy);
+  obj->settings = g_settings_new (SHELL_SCHEMA);
   obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                      G_CALLBACK (on_shell_signal), obj);
 
+  obj->watch_name_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                         "org.gnome.Shell",
+                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                         on_shell_appeared,
+                                         NULL,
+                                         obj,
+                                         NULL);
+
   g_debug ("plugin object created");
 
   return (NPObject*)obj;
@@ -328,41 +363,22 @@ plugin_object_deallocate (NPObject *npobj)
   if (obj->listener)
     funcs.releaseobject (obj->listener);
 
+  if (obj->watch_name_id)
+    g_bus_unwatch_name (obj->watch_name_id);
+
   g_debug ("plugin object destroyed");
 
   g_slice_free (PluginObject, obj);
 }
 
-static NPIdentifier api_version_id;
-static NPIdentifier shell_version_id;
-static NPIdentifier get_info_id;
-static NPIdentifier list_extensions_id;
-static NPIdentifier enable_extension_id;
-static NPIdentifier install_extension_id;
-static NPIdentifier uninstall_extension_id;
-static NPIdentifier onextension_changed_id;
-static NPIdentifier get_errors_id;
-
-static bool
-plugin_object_has_method (NPObject     *npobj,
-                          NPIdentifier  name)
-{
-  return (name == get_info_id ||
-          name == list_extensions_id ||
-          name == enable_extension_id ||
-          name == install_extension_id ||
-          name == uninstall_extension_id ||
-          name == get_errors_id);
-}
-
 static inline gboolean
-uuid_is_valid (const gchar *uuid)
+uuid_is_valid (NPString string)
 {
   gsize i;
 
-  for (i = 0; uuid[i]; i ++)
+  for (i = 0; i < string.UTF8Length; i++)
     {
-      gchar c = uuid[i];
+      gchar c = string.UTF8Characters[i];
       if (c < 32 || c >= 127)
         return FALSE;
 
@@ -426,8 +442,73 @@ jsonify_variant (GVariant  *variant,
 }
 
 static gboolean
-plugin_list_extensions (PluginObject  *obj,
+parse_args (const gchar     *format_str,
-                        NPVariant     *result)
+            uint32_t         argc,
+            const NPVariant *argv,
+            ...)
+{
+  va_list args;
+  gsize i;
+  gboolean ret = FALSE;
+
+  if (strlen (format_str) != argc)
+    return FALSE;
+
+  va_start (args, argv);
+
+  for (i = 0; format_str[i]; i++)
+    {
+      gpointer arg_location;
+      const NPVariant arg = argv[i];
+
+      arg_location = va_arg (args, gpointer);
+
+      switch (format_str[i])
+        {
+        case 'u':
+          {
+            NPString string;
+
+            if (!NPVARIANT_IS_STRING (arg))
+              goto out;
+
+            string = NPVARIANT_TO_STRING (arg);
+
+            if (!uuid_is_valid (string))
+              goto out;
+
+            *(gchar **) arg_location = g_strndup (string.UTF8Characters, string.UTF8Length);
+          }
+          break;
+
+        case 'b':
+          if (!NPVARIANT_IS_BOOLEAN (arg))
+            goto out;
+
+          *(gboolean *) arg_location = NPVARIANT_TO_BOOLEAN (arg);
+          break;
+
+        case 'o':
+          if (!NPVARIANT_IS_OBJECT (arg))
+            goto out;
+
+          *(NPObject **) arg_location = NPVARIANT_TO_OBJECT (arg);
+        }
+    }
+
+  ret = TRUE;
+
+ out:
+  va_end (args);
+
+  return ret;
+}
+
+static gboolean
+plugin_list_extensions (PluginObject    *obj,
+                        uint32_t         argc,
+                        const NPVariant *args,
+                        NPVariant       *result)
 {
   GError *error = NULL;
   GVariant *res;
@@ -451,71 +532,160 @@ plugin_list_extensions (PluginObject  *obj,
 }
 
 static gboolean
-plugin_enable_extension (PluginObject *obj,
+plugin_enable_extension (PluginObject    *obj,
-                         NPString      uuid,
+                         uint32_t         argc,
-                         gboolean      enabled)
+                         const NPVariant *argv,
+                         NPVariant       *result)
 {
-  const gchar *uuid_str = uuid.UTF8Characters;
+  gboolean ret;
-  if (!uuid_is_valid (uuid_str))
+  gchar *uuid;
+  gboolean enabled;
+  gsize length;
+  gchar **uuids;
+  const gchar **new_uuids;
+
+  if (!parse_args ("ub", argc, argv, &uuid, &enabled))
     return FALSE;
 
-  g_dbus_proxy_call (obj->proxy,
+  uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
-                     (enabled ? "EnableExtension" : "DisableExtension"),
+  length = g_strv_length (uuids);
-                     g_variant_new ("(s)", uuid_str),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1, /* timeout */
-                     NULL, /* cancellable */
-                     NULL, /* callback */
-                     NULL /* user_data */);
 
-  return TRUE;
+  if (enabled)
+    {
+      new_uuids = g_new (const gchar *, length + 2); /* New key, NULL */
+      memcpy (new_uuids, uuids, length * sizeof (*new_uuids));
+      new_uuids[length] = uuid;
+      new_uuids[length + 1] = NULL;
+    }
+  else
+    {
+      gsize i = 0, j = 0;
+      new_uuids = g_new (const gchar *, length);
+      for (i = 0; i < length; i ++)
+        {
+          if (g_str_equal (uuids[i], uuid))
+            continue;
+
+          new_uuids[j] = uuids[i];
+          j++;
+        }
+
+      new_uuids[j] = NULL;
+    }
+
+  ret = g_settings_set_strv (obj->settings,
+                             ENABLED_EXTENSIONS_KEY,
+                             new_uuids);
+
+  g_strfreev (uuids);
+  g_free (new_uuids);
+  g_free (uuid);
+
+  return ret;
+}
+
+typedef struct _AsyncClosure AsyncClosure;
+
+struct _AsyncClosure {
+  PluginObject *obj;
+  NPObject *callback;
+  NPObject *errback;
+};
+
+static void
+install_extension_cb (GObject      *proxy,
+                      GAsyncResult *async_res,
+                      gpointer      user_data)
+{
+  AsyncClosure *async_closure = (AsyncClosure *) user_data;
+  GError *error = NULL;
+  GVariant *res;
+  NPVariant args[1];
+  NPVariant result = { NPVariantType_Void };
+  NPObject *callback;
+
+  res = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), async_res, &error);
+
+  if (res == NULL)
+    {
+      if (g_dbus_error_is_remote_error (error))
+        g_dbus_error_strip_remote_error (error);
+      STRINGZ_TO_NPVARIANT (error->message, args[0]);
+      callback = async_closure->errback;
+    }
+  else
+    {
+      char *string_result;
+      g_variant_get (res, "(&s)", &string_result);
+      STRINGZ_TO_NPVARIANT (string_result, args[0]);
+      callback = async_closure->callback;
+    }
+
+  funcs.invokeDefault (async_closure->obj->instance,
+                       callback, args, 1, &result);
+
+  funcs.releasevariantvalue (&result);
+
+  funcs.releaseobject (async_closure->callback);
+  funcs.releaseobject (async_closure->errback);
+  g_slice_free (AsyncClosure, async_closure);
 }
 
 static gboolean
-plugin_install_extension (PluginObject *obj,
+plugin_install_extension (PluginObject    *obj,
-                          NPString      uuid,
+                          uint32_t         argc,
-                          NPString      version_tag)
+                          const NPVariant *argv,
+                          NPVariant       *result)
 {
-  const gchar *uuid_str = uuid.UTF8Characters;
+  gchar *uuid;
-  if (!uuid_is_valid (uuid_str))
+  NPObject *callback, *errback;
+  AsyncClosure *async_closure;
+
+  if (!parse_args ("uoo", argc, argv, &uuid, &callback, &errback))
     return FALSE;
 
+  async_closure = g_slice_new (AsyncClosure);
+  async_closure->obj = obj;
+  async_closure->callback = funcs.retainobject (callback);
+  async_closure->errback = funcs.retainobject (errback);
+
   g_dbus_proxy_call (obj->proxy,
                      "InstallRemoteExtension",
-                     g_variant_new ("(ss)",
+                     g_variant_new ("(s)", uuid),
-                                    uuid_str,
-                                    version_tag.UTF8Characters),
                      G_DBUS_CALL_FLAGS_NONE,
                      -1, /* timeout */
                      NULL, /* cancellable */
-                     NULL, /* callback */
+                     install_extension_cb,
-                     NULL /* user_data */);
+                     async_closure);
+
+  g_free (uuid);
 
   return TRUE;
 }
 
 static gboolean
-plugin_uninstall_extension (PluginObject *obj,
+plugin_uninstall_extension (PluginObject    *obj,
-                            NPString      uuid,
+                            uint32_t         argc,
-                            NPVariant    *result)
+                            const NPVariant *argv,
+                            NPVariant       *result)
 {
   GError *error = NULL;
   GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid;
 
-  uuid_str = uuid.UTF8Characters;
+  if (!parse_args ("u", argc, argv, &uuid))
-  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "UninstallExtension",
-                                g_variant_new ("(s)",
+                                g_variant_new ("(s)", uuid),
-                                               uuid_str),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
                                 &error);
 
+  g_free (uuid);
+
   if (!res)
     {
       g_warning ("Failed to uninstall extension: %s", error->message);
@@ -527,26 +697,28 @@ plugin_uninstall_extension (PluginObject *obj,
 }
 
 static gboolean
-plugin_get_info (PluginObject *obj,
+plugin_get_info (PluginObject    *obj,
-                 NPString      uuid,
+                 uint32_t         argc,
-                 NPVariant    *result)
+                 const NPVariant *argv,
+                 NPVariant       *result)
 {
   GError *error = NULL;
   GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid;
 
-  uuid_str = uuid.UTF8Characters;
+  if (!parse_args ("u", argc, argv, &uuid))
-  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "GetExtensionInfo",
-                                g_variant_new ("(s)", uuid_str),
+                                g_variant_new ("(s)", uuid),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
                                 &error);
 
+  g_free (uuid);
+
   if (!res)
     {
       g_warning ("Failed to retrieve extension metadata: %s", error->message);
@@ -558,21 +730,21 @@ plugin_get_info (PluginObject *obj,
 }
 
 static gboolean
-plugin_get_errors (PluginObject *obj,
+plugin_get_errors (PluginObject    *obj,
-                   NPString      uuid,
+                   uint32_t         argc,
-                   NPVariant    *result)
+                   const NPVariant *argv,
+                   NPVariant       *result)
 {
   GError *error = NULL;
   GVariant *res;
-  const gchar *uuid_str;
+  gchar *uuid;
 
-  uuid_str = uuid.UTF8Characters;
+  if (!parse_args ("u", argc, argv, &uuid))
-  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "GetExtensionErrors",
-                                g_variant_new ("(s)", uuid_str),
+                                g_variant_new ("(s)", uuid),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
@@ -588,6 +760,29 @@ plugin_get_errors (PluginObject *obj,
   return jsonify_variant (res, result);
 }
 
+static gboolean
+plugin_launch_extension_prefs (PluginObject    *obj,
+                               uint32_t         argc,
+                               const NPVariant *argv,
+                               NPVariant       *result)
+{
+  gchar *uuid;
+
+  if (!parse_args ("u", argc, argv, &uuid))
+    return FALSE;
+
+  g_dbus_proxy_call (obj->proxy,
+                     "LaunchExtensionPrefs",
+                     g_variant_new ("(s)", uuid),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1, /* timeout */
+                     NULL, /* cancellable */
+                     NULL, /* callback */
+                     NULL /* user_data */);
+
+  return TRUE;
+}
+
 static int
 plugin_get_api_version (PluginObject  *obj,
                         NPVariant     *result)
@@ -633,14 +828,45 @@ plugin_get_shell_version (PluginObject  *obj,
   STRINGN_TO_NPVARIANT (buffer, length, *result);
 
  out:
-  g_variant_unref (res);
+  if (res)
+    g_variant_unref (res);
   return ret;
 }
 
+#define METHODS                                 \
+  METHOD (list_extensions)                      \
+  METHOD (get_info)                             \
+  METHOD (enable_extension)                     \
+  METHOD (install_extension)                    \
+  METHOD (uninstall_extension)                  \
+  METHOD (get_errors)                           \
+  METHOD (launch_extension_prefs)               \
+  /* */
+
+#define METHOD(x)                               \
+  static NPIdentifier x##_id;
+METHODS
+#undef METHOD
+
+static NPIdentifier api_version_id;
+static NPIdentifier shell_version_id;
+static NPIdentifier onextension_changed_id;
+static NPIdentifier onrestart_id;
+
+static bool
+plugin_object_has_method (NPObject     *npobj,
+                          NPIdentifier  name)
+{
+#define METHOD(x) (name == (x##_id)) ||
+  /* expands to (name == list_extensions_id) || FALSE; */
+  return METHODS FALSE;
+#undef METHOD
+}
+
 static bool
 plugin_object_invoke (NPObject        *npobj,
                       NPIdentifier     name,
-                      const NPVariant *args,
+                      const NPVariant *argv,
                       uint32_t         argc,
                       NPVariant       *result)
 {
@@ -652,53 +878,13 @@ plugin_object_invoke (NPObject        *npobj,
 
   VOID_TO_NPVARIANT (*result);
 
-  if (!plugin_object_has_method (npobj, name))
+#define METHOD(x)                                       \
-    return FALSE;
+  if (name == x##_id)                                   \
+    return plugin_##x (obj, argc, argv, result);
+METHODS
+#undef METHOD
 
-  if (name == list_extensions_id)
+  return FALSE;
-    return plugin_list_extensions (obj, result);
-  else if (name == get_info_id)
-    {
-      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
-
-      return plugin_get_info (obj, NPVARIANT_TO_STRING(args[0]), result);
-    }
-  else if (name == enable_extension_id)
-    {
-      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
-      if (!NPVARIANT_IS_BOOLEAN(args[1])) return FALSE;
-
-      return plugin_enable_extension (obj,
-                                      NPVARIANT_TO_STRING(args[0]),
-                                      NPVARIANT_TO_BOOLEAN(args[1]));
-    }
-  else if (name == install_extension_id)
-    {
-      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
-      if (!NPVARIANT_IS_STRING(args[1])) return FALSE;
-
-      return plugin_install_extension (obj,
-                                       NPVARIANT_TO_STRING(args[0]),
-                                       NPVARIANT_TO_STRING(args[1]));
-    }
-  else if (name == uninstall_extension_id)
-    {
-      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
-
-      return plugin_uninstall_extension (obj,
-                                         NPVARIANT_TO_STRING(args[0]),
-                                         result);
-    }
-  else if (name == get_errors_id)
-    {
-      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
-
-      return plugin_get_errors (obj,
-                                NPVARIANT_TO_STRING(args[0]),
-                                result);
-    }
-
-  return TRUE;
 }
 
 static bool
@@ -706,6 +892,7 @@ plugin_object_has_property (NPObject     *npobj,
                             NPIdentifier  name)
 {
   return (name == onextension_changed_id ||
+          name == onrestart_id ||
           name == api_version_id ||
           name == shell_version_id);
 }
@@ -732,6 +919,33 @@ plugin_object_get_property (NPObject     *npobj,
       else
         NULL_TO_NPVARIANT (*result);
     }
+  else if (name == onrestart_id)
+    {
+      if (obj->restart_listener)
+        OBJECT_TO_NPVARIANT (obj->restart_listener, *result);
+      else
+        NULL_TO_NPVARIANT (*result);
+    }
+
+  return TRUE;
+}
+
+static bool
+plugin_object_set_callback (NPObject        **listener,
+                            const NPVariant  *value)
+{
+  if (!NPVARIANT_IS_OBJECT (*value) && !NPVARIANT_IS_NULL (*value))
+    return FALSE;
+
+  if (*listener)
+    funcs.releaseobject (*listener);
+  *listener = NULL;
+
+  if (NPVARIANT_IS_OBJECT (*value))
+    {
+      *listener = NPVARIANT_TO_OBJECT (*value);
+      funcs.retainobject (*listener);
+    }
 
   return TRUE;
 }
@@ -743,25 +957,13 @@ plugin_object_set_property (NPObject        *npobj,
 {
   PluginObject *obj;
 
-  if (!plugin_object_has_property (npobj, name))
+  obj = (PluginObject *)npobj;
-    return FALSE;
 
   if (name == onextension_changed_id)
-    {
+    return plugin_object_set_callback (&obj->listener, value);
-      obj = (PluginObject*) npobj;
-      if (obj->listener)
-        funcs.releaseobject (obj->listener);
 
-      obj->listener = NULL;
+  if (name == onrestart_id)
-      if (NPVARIANT_IS_OBJECT (*value))
+    return plugin_object_set_callback (&obj->restart_listener, value);
-        {
-          obj->listener = NPVARIANT_TO_OBJECT (*value);
-          funcs.retainobject (obj->listener);
-          return TRUE;
-        }
-      else if (NPVARIANT_IS_NULL (*value))
-        return TRUE;
-    }
 
   return FALSE;
 }
@@ -795,7 +997,9 @@ init_methods_and_properties (void)
   install_extension_id = funcs.getstringidentifier ("installExtension");
   uninstall_extension_id = funcs.getstringidentifier ("uninstallExtension");
   get_errors_id = funcs.getstringidentifier ("getExtensionErrors");
+  launch_extension_prefs_id = funcs.getstringidentifier ("launchExtensionPrefs");
 
+  onrestart_id = funcs.getstringidentifier ("onshellrestart");
   onextension_changed_id = funcs.getstringidentifier ("onchange");
 }
 
@@ -824,3 +1028,12 @@ NPP_GetValue(NPP          instance,
 
   return NPERR_NO_ERROR;
 }
+
+/* Opera tries to call NPP_SetWindow without checking the
+ * NULL pointer beforehand. */
+NPError
+NPP_SetWindow(NPP          instance,
+              NPWindow    *window)
+{
+  return NPERR_NO_ERROR;
+}

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.3.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.7.3.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -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
@@ -44,46 +46,51 @@ AC_SUBST(PYTHON)
 
 # We need at least this, since gst_plugin_register_static() was added
 # in 0.10.16, but nothing older than 0.10.21 has been tested.
-GSTREAMER_MIN_VERSION=0.10.16
+GSTREAMER_MIN_VERSION=0.11.92
 
 recorder_modules=
 build_recorder=false
 AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
-if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
+if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
-   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
+   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.7.5
+CLUTTER_MIN_VERSION=1.11.11
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.29.18
+GJS_MIN_VERSION=1.33.2
-MUTTER_MIN_VERSION=3.3.2
+MUTTER_MIN_VERSION=3.7.3
-FOLKS_MIN_VERSION=0.5.2
+GTK_MIN_VERSION=3.3.9
-GTK_MIN_VERSION=3.0.0
+GIO_MIN_VERSION=2.35.0
-GIO_MIN_VERSION=2.31.0
+LIBECAL_MIN_VERSION=3.5.3
-LIBECAL_MIN_VERSION=2.32.0
+LIBEDATASERVER_MIN_VERSION=3.5.3
-LIBEDATASERVER_MIN_VERSION=1.2.0
+LIBEDATASERVERUI_MIN_VERSION=3.5.3
-LIBEDATASERVERUI_MIN_VERSION=2.91.6
+TELEPATHY_GLIB_MIN_VERSION=0.17.5
-TELEPATHY_GLIB_MIN_VERSION=0.15.5
 TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
+GCR_MIN_VERSION=3.3.90
+GNOME_DESKTOP_REQUIRED_VERSION=3.7.1
+GNOME_MENUS_REQUIRED_VERSION=3.5.3
+PULSE_MIN_VERS=2.0
 
 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libxml-2.0
                                gtk+-3.0 >= $GTK_MIN_VERSION
-                               folks >= $FOLKS_MIN_VERSION
+                               atk-bridge-2.0
                                libmutter >= $MUTTER_MIN_VERSION
                                gjs-internals-1.0 >= $GJS_MIN_VERSION
-			       libgnome-menu-3.0 $recorder_modules
+			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
+                               $recorder_modules
                                gdk-x11-3.0 libsoup-2.4
+                               gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
 			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
@@ -92,7 +99,8 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
-                               libnm-glib libnm-util gnome-keyring-1)
+                               libnm-glib libnm-util gnome-keyring-1
+                               gcr-3 >= $GCR_MIN_VERSION)
 
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 
@@ -100,13 +108,10 @@ 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)
 
-GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
-AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
-AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
 
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
-JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
-AC_SUBST(JHBUILD_TYPELIBDIR)
 
 saved_CFLAGS=$CFLAGS
 saved_LIBS=$LIBS
@@ -116,10 +121,11 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS
 
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
+PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
-PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.2.2)
 
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -135,10 +141,37 @@ 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)
 
+AC_ARG_WITH(systemd,
+            AS_HELP_STRING([--with-systemd],
+                           [Add systemd support]),
+            [with_systemd=$withval], [with_systemd=auto])
+
+PKG_CHECK_MODULES(SYSTEMD,
+                  [libsystemd-login libsystemd-daemon],
+                  [have_systemd=yes], [have_systemd=no])
+
+if test "x$with_systemd" = "xauto" ; then
+        if test x$have_systemd = xno ; then
+                use_systemd=no
+        else
+                use_systemd=yes
+        fi
+else
+        use_systemd=$with_systemd
+fi
+
+if test "x$use_systemd" = "xyes"; then
+        if test "x$have_systemd" = "xno"; then
+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
+        fi
+
+        AC_DEFINE(WITH_SYSTEMD, 1, [systemd support])
+fi
+
 MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
 AC_SUBST(MUTTER_GIR_DIR)
@@ -177,11 +210,23 @@ 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,
   AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
-  enable_compile_warnings=maximum)
+  enable_compile_warnings=error)
 
 changequote(,)dnl
 if test "$enable_compile_warnings" != no ; then
@@ -197,7 +242,7 @@ if test "$enable_compile_warnings" != no ; then
     if test "$enable_compile_warnings" = error ; then
       case " $CFLAGS " in
       *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror" ;;
+      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
       esac
     fi
   fi
@@ -205,34 +250,9 @@ fi
 changequote([,])dnl
 
 AC_ARG_ENABLE(jhbuild-wrapper-script,
-  AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
+  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
 AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
 
-AC_MSG_CHECKING([location of system Certificate Authority list])
-AC_ARG_WITH(ca-certificates,
-            [AC_HELP_STRING([--with-ca-certificates=@<:@path@:>@],
-                            [path to system Certificate Authority list])])
-
-if test "$with_ca_certificates" = "no"; then
-    AC_MSG_RESULT([disabled])
-else
-    if test -z "$with_ca_certificates"; then
-        for f in /etc/pki/tls/certs/ca-bundle.crt \
-                 /etc/ssl/certs/ca-certificates.crt; do
-             if test -f "$f"; then
-                with_ca_certificates="$f"
-             fi
-        done
-        if test -z "$with_ca_certificates"; then
-            AC_MSG_ERROR([could not find. Use --with-ca-certificates=path to set, or --without-ca-certificates to disable])
-        fi
-   fi
-
-   AC_MSG_RESULT($with_ca_certificates)
-   AC_DEFINE_UNQUOTED(SHELL_SYSTEM_CA_FILE, ["$with_ca_certificates"], [The system TLS CA list])
-fi
-AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
-
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
@@ -246,8 +266,9 @@ AC_CONFIG_FILES([
   docs/reference/st/Makefile
   docs/reference/st/st-docs.sgml
   js/Makefile
-  js/misc/config.js
+  src/calendar-server/evolution-calendar.desktop.in
   src/Makefile
+  src/gvc/Makefile
   browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in

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,21 @@
+<?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"/>
+
+	<KeyListEntry name="focus-active-notification"
+                      _description="Focus the active notification"/>
+
+	<KeyListEntry name="toggle-application-view"
+                      _description="Show all applications"/>
+
+	<KeyListEntry name="open-application-menu"
+                      _description="Open the application menu"/>
+
+</KeyListEntries>
+

data/Makefile.am

@@ -1,5 +1,5 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@@ -8,20 +8,22 @@ desktop_DATA = gnome-shell.desktop
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@
 
-# Placeholder until we add intltool
+@INTLTOOL_DESKTOP_RULE@
-%.desktop:%.desktop.in
-	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-searchprovidersdir = $(pkgdatadir)/search_providers
+introspectiondir = $(datadir)/dbus-1/interfaces
-dist_searchproviders_DATA =				\
+introspection_DATA =				\
-	search_providers/google.xml				\
+	org.gnome.ShellSearchProvider.xml	\
-	search_providers/wikipedia.xml
+	org.gnome.ShellSearchProvider2.xml
 
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
 	theme/calendar-arrow-left.svg		\
 	theme/calendar-arrow-right.svg		\
 	theme/calendar-today.svg		\
+	theme/checkbox-focused.svg		\
+	theme/checkbox-off-focused.svg		\
+	theme/checkbox-off.svg			\
+	theme/checkbox.svg			\
 	theme/close-window.svg			\
 	theme/close.svg				\
 	theme/corner-ripple-ltr.png		\
@@ -29,27 +31,40 @@ dist_theme_DATA =				\
 	theme/dash-placeholder.svg		\
 	theme/filter-selected-ltr.svg		\
 	theme/filter-selected-rtl.svg		\
-	theme/gdm.css				\
 	theme/gnome-shell.css			\
-	theme/panel-border.svg			\
+	theme/logged-in-indicator.svg		\
+	theme/message-tray-background.png	\
+	theme/more-results.svg			\
+	theme/noise-texture.png			\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
 	theme/panel-button-highlight-wide.svg	\
 	theme/process-working.svg		\
 	theme/running-indicator.svg		\
-	theme/scroll-hhandle.svg		\
-	theme/scroll-vhandle.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			\
 	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.svg		\
+	theme/ws-switch-arrow-up.png		\
-	theme/ws-switch-arrow-down.svg
+	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@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
+	$< > $@ || rm $@
+
 @GSETTINGS_RULES@
 
 # We need to compile schemas at make time
@@ -59,21 +74,24 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
 
 all-local: gschemas.compiled
 
-
+convertdir = $(datadir)/GConf/gsettings
-shadersdir = $(pkgdatadir)/shaders
+convert_DATA = gnome-shell-overrides.convert
-shaders_DATA = \
-	shaders/dim-window.glsl
-
 
 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
+	gnome-shell-extension-prefs.desktop.in.in	\
+	$(introspection_DATA)				\
 	$(menu_DATA)					\
-	$(shaders_DATA)					\
+	$(convert_DATA)					\
-	org.gnome.shell.gschema.xml.in
+	$(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
+	gschemas.compiled				\
-
+	org.gnome.shell.gschema.valid			\
+	org.gnome.shell.gschema.xml.in

data/gnome-shell-extension-prefs.desktop.in.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Shell Extension Preferences
+_Comment=Configure GNOME Shell Extensions
+Exec=@bindir@/gnome-shell-extension-prefs %u
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=extensions
+X-GNOME-Bugzilla-Version=@VERSION@
+Categories=GNOME;GTK;
+OnlyShowIn=GNOME;
+NoDisplay=true

data/gnome-shell-overrides.convert

@@ -0,0 +1,5 @@
+[org.gnome.shell.overrides]
+attach-modal-dialogs = /desktop/gnome/shell/windows/attach_modal_dialogs
+button-layout = /desktop/gnome/shell/windows/button_layout
+edge-tiling = /desktop/gnome/shell/windows/edge_tiling
+workspaces-only-on-primary = /desktop/gnome/shell/windows/workspaces_only_on_primary

data/gnome-shell.desktop.in.in

@@ -13,4 +13,4 @@ NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
+X-GNOME-AutoRestart=false

data/org.gnome.ShellSearchProvider.xml

@@ -0,0 +1,73 @@
+<!DOCTYPE node PUBLIC
+'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
+'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+<node>
+
+  <!--
+      org.gnome.Shell.SearchProvider:
+      @short_description: Search provider interface
+
+      The interface used for integrating into GNOME Shell's search
+      interface. This interface is deprecated, and org.gnome.Shell.SearchProvider2 should be used instead.
+  -->
+  <interface name="org.gnome.Shell.SearchProvider">
+
+    <!--
+        GetInitialResultSet:
+        @terms: Array of search terms, which the provider should treat as logical AND.
+        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
+
+        Called when the user first begins a search.
+    -->
+    <method name="GetInitialResultSet">
+      <arg type="as" name="terms" direction="in" />
+      <arg type="as" name="results" direction="out" />
+    </method>
+
+    <!--
+        GetSubsearchResultSet:
+        @previous_results: Array of results previously returned by GetInitialResultSet().
+        @terms: Array of updated search terms, which the provider should treat as logical AND.
+        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
+
+        Called when a search is performed which is a "subsearch" of
+        the previous search, e.g. the method may return less results, but
+        not more or different results.
+
+        This allows search providers to only search through the previous
+        result set, rather than possibly performing a full re-query.
+    -->
+    <method name="GetSubsearchResultSet">
+      <arg type="as" name="previous_results" direction="in" />
+      <arg type="as" name="terms" direction="in" />
+      <arg type="as" name="results" direction="out" />
+    </method>
+
+    <!--
+        GetResultMetas:
+        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
+        @metas: A dictionary describing the given search result, containing 'id' and 'name' (both strings). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images).
+
+        Return an array of meta data used to display each given result
+    -->
+    <method name="GetResultMetas">
+      <arg type="as" name="identifiers" direction="in" />
+      <arg type="aa{sv}" name="metas" direction="out" />
+    </method>
+
+    <!--
+        ActivateResult:
+        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
+
+        Called when the users chooses a given result. The result should
+        be displayed in the application associated with the corresponding
+        provider.
+
+        This method is deprecated, and providers should implement ActivateResult2()
+        instead.
+    -->
+    <method name="ActivateResult">
+      <arg type="s" name="identifier" direction="in" />
+    </method>
+  </interface>
+</node>

data/org.gnome.ShellSearchProvider2.xml

@@ -0,0 +1,87 @@
+<!DOCTYPE node PUBLIC
+'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
+'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+<node>
+
+  <!--
+      org.gnome.Shell.SearchProvider2:
+      @short_description: Search provider interface
+
+      The interface used for integrating into GNOME Shell's search
+      interface (version 2).
+  -->
+  <interface name="org.gnome.Shell.SearchProvider2">
+
+    <!--
+        GetInitialResultSet:
+        @terms: Array of search terms, which the provider should treat as logical AND.
+        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
+
+        Called when the user first begins a search.
+    -->
+    <method name="GetInitialResultSet">
+      <arg type="as" name="terms" direction="in" />
+      <arg type="as" name="results" direction="out" />
+    </method>
+
+    <!--
+        GetSubsearchResultSet:
+        @previous_results: Array of results previously returned by GetInitialResultSet().
+        @terms: Array of updated search terms, which the provider should treat as logical AND.
+        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
+
+        Called when a search is performed which is a "subsearch" of
+        the previous search, e.g. the method may return less results, but
+        not more or different results.
+
+        This allows search providers to only search through the previous
+        result set, rather than possibly performing a full re-query.
+    -->
+    <method name="GetSubsearchResultSet">
+      <arg type="as" name="previous_results" direction="in" />
+      <arg type="as" name="terms" direction="in" />
+      <arg type="as" name="results" direction="out" />
+    </method>
+
+    <!--
+        GetResultMetas:
+        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
+        @metas: A dictionary describing the given search result, containing 'id' and 'name' (both strings). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.
+
+        Return an array of meta data used to display each given result
+    -->
+    <method name="GetResultMetas">
+      <arg type="as" name="identifiers" direction="in" />
+      <arg type="aa{sv}" name="metas" direction="out" />
+    </method>
+
+    <!--
+        ActivateResult:
+        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
+        @terms: Array of search terms, which the provider should treat as logical AND.
+        @timestamp: A timestamp of the user interaction that triggered this call
+
+        Called when the users chooses a given result. The result should
+        be displayed in the application associated with the corresponding
+        provider. The provided search terms can be used to allow launching a full search in
+        the application.
+    -->
+    <method name="ActivateResult">
+      <arg type="s" name="identifier" direction="in" />
+      <arg type="as" name="terms" direction="in" />
+      <arg type="u" name="timestamp" direction="in" />
+    </method>
+
+    <!--
+        LaunchSearch:
+        @terms: Array of search terms, which the provider should treat as logical AND.
+        @timestamp: A timestamp of the user interaction that triggered this call
+
+        Asks the search provider to launch a full search in the application for the provided terms.
+    -->
+    <method name="LaunchSearch">
+      <arg type="as" name="terms" direction="in" />
+      <arg type="u" name="timestamp" direction="in" />
+    </method>
+  </interface>
+</node>

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>
@@ -53,15 +49,40 @@
     </key>
     <key name="saved-im-presence" type="i">
       <default>1</default>
-      <_summary></_summary>
+      <_summary>Internally used to store the last IM presence explicitly set by the user. The
+value here is from the TpConnectionPresenceType enumeration.</_summary>
     </key>
     <key name="saved-session-presence" type="i">
       <default>0</default>
-      <_summary></_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>
+    <key name="show-full-name" type="b">
+      <default>true</default>
+      <_summary>Show full name in the user menu</_summary>
+      <_description>Whether the users full name is shown in the user menu or not.</_description>
+    </key>
+    <key name="remember-mount-password" type="b">
+      <default>false</default>
+      <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>
+      <_description>
+        The shell will request a password when an encrypted device or a
+        remote filesystem is mounted.  If the password can be saved for
+        future use a 'Remember Password' checkbox will be present.
+        This key sets the default state of the checkbox.
+      </_description>
     </key>
-    <child name="clock" schema="org.gnome.shell.clock"/>
     <child name="calendar" schema="org.gnome.shell.calendar"/>
     <child name="recorder" schema="org.gnome.shell.recorder"/>
+    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
     <child name="keyboard" schema="org.gnome.shell.keyboard"/>
   </schema>
 
@@ -76,6 +97,46 @@
       </key>
   </schema>
 
+  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="open-application-menu" type="as">
+      <default>["&lt;Super&gt;F10"]</default>
+      <_summary>Keybinding to open the application menu</_summary>
+      <_description>
+        Keybinding to open the application menu.
+      </_description>
+    </key>
+    <key name="toggle-application-view" type="as">
+      <default>["&lt;Super&gt;a"]</default>
+      <_summary>Keybinding to open the "Show Applications" view</_summary>
+      <_description>
+        Keybinding to open the "Show Applications" view of the Activities
+        Overview.
+      </_description>
+    </key>
+    <key name="toggle-message-tray" type="as">
+      <default>["&lt;Super&gt;m"]</default>
+      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
+      <_description>
+        Keybinding to toggle the visibility of the message tray.
+      </_description>
+    </key>
+    <key name="focus-active-notification" type="as">
+      <default>["&lt;Super&gt;n"]</default>
+      <_summary>Keybinding to focus the active notification</_summary>
+      <_description>
+        Keybinding to focus the active notification.
+      </_description>
+    </key>
+    <key name="toggle-recording" type="as">
+      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
+      <_summary>Keybinding to toggle the screen recorder</_summary>
+      <_description>
+        Keybinding to start/stop the builtin screen recorder.
+      </_description>
+    </key>
+  </schema>
+
   <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="keyboard-type" type="s">
@@ -87,28 +148,10 @@
     </key>
   </schema>
 
-  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="show-seconds" type="b">
-      <default>false</default>
-      <_summary>Show time with seconds</_summary>
-      <_description>
-        If true, display seconds in time.
-      </_description>
-    </key>
-    <key name="show-date" type="b">
-      <default>false</default>
-      <_summary>Show date in clock</_summary>
-      <_description>
-        If true, display date in the clock, in addition to time.
-      </_description>
-    </key>
-  </schema>
-
   <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="framerate" type="i">
-      <default>15</default>
+      <default>30</default>
       <_summary>Framerate used for recording screencasts.</_summary>
       <_description>
         The framerate of the resulting screencast recordered
@@ -127,7 +170,7 @@
         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
-        'videorate ! vp8enc quality=10 speed=2 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>
@@ -143,36 +186,80 @@
     </key>
   </schema>
 
-  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/">
+  <enum id="org.gnome.shell.window-switcher.AppIconMode">
+    <value value="1" nick="thumbnail-only"/>
+    <value value="2" nick="app-icon-only"/>
+    <value value="3" nick="both"/>
+  </enum>
+  <schema id="org.gnome.shell.window-switcher"
+          path="/org/gnome/shell/window-switcher/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="app-icon-mode" enum="org.gnome.shell.window-switcher.AppIconMode">
+      <default>'both'</default>
+      <_summary>The application icon mode.</_summary>
+      <_description>
+	Configures how the windows are shown in the switcher. Valid possibilities
+	are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only'
+	(shows only the application icon) or 'both'.
+      </_description>
+    </key>
+    <key type="b" name="current-workspace-only">
+      <default>false</default>
+      <summary>Limit switcher to current workspace.</summary>
+      <description>
+	If true, only windows from the current workspace are shown in the switcher.
+	Otherwise, all windows are included.
+      </description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
+	  gettext-domain="@GETTEXT_PACKAGE@">
     <key name="attach-modal-dialogs" type="b">
       <default>true</default>
-      <summary>Attach modal dialog to the parent window</summary>
+      <_summary>Attach modal dialog to the parent window</_summary>
-      <description>
+      <_description>
         This key overrides the key in org.gnome.mutter when running
         GNOME Shell.
-      </description>
+      </_description>
     </key>
 
     <key name="button-layout" type="s">
       <default>":close"</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
+      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <description>
+      <_description>
         This key overrides the key in org.gnome.desktop.wm.preferences when
         running GNOME Shell.
-      </description>
+      </_description>
     </key>
 
     <key name="edge-tiling" type="b">
       <default>true</default>
-      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <description>
+      <_description>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
+      </_description>
+    </key>
+
+    <key name="dynamic-workspaces" type="b">
+      <default>true</default>
+      <_summary>Workspaces are managed dynamically</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
     </key>
 
     <key name="workspaces-only-on-primary" type="b">
       <default>true</default>
-      <summary>Workspaces only on primary monitor</summary>
+      <_summary>Workspaces only on primary monitor</_summary>
+      <_description>
+        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>

data/search_providers/google.xml

@@ -1,7 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-<ShortName>Google</ShortName>
-<Description>Google Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
-<Url type="text/html" method="GET" template="http://www.google.com/search?q={searchTerms}"/>
-</OpenSearchDescription>

data/search_providers/wikipedia.xml

@@ -1,44 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-<ShortName>Wikipedia</ShortName>
-<Description>Wikipedia, the free encyclopedia</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
-<Url type="text/html" method="GET" template="http://{language}.wikipedia.org/wiki/Special:Search?search={searchTerms}"/>
-<!-- The criterion for being below is being listed with more than 100,000
-articles on http://meta.wikimedia.org/wiki/List_of_Wikipedias -->
-<Language>ar</Language>
-<Language>bg</Language>
-<Language>ca</Language>
-<Language>cs</Language>
-<Language>da</Language>
-<Language>de</Language>
-<Language>en</Language>
-<Language>eo</Language>
-<Language>es</Language>
-<Language>fa</Language>
-<Language>fi</Language>
-<Language>fr</Language>
-<Language>he</Language>
-<Language>hu</Language>
-<Language>id</Language>
-<Language>it</Language>
-<Language>ja</Language>
-<Language>ko</Language>
-<Language>lt</Language>
-<Language>nl</Language>
-<Language>no</Language>
-<Language>pl</Language>
-<Language>pt</Language>
-<Language>ro</Language>
-<Language>ru</Language>
-<Language>sk</Language>
-<Language>sl</Language>
-<Language>sr</Language>
-<Language>sv</Language>
-<Language>tr</Language>
-<Language>uk</Language>
-<Language>vi</Language>
-<Language>vo</Language>
-<Language>war</Language>
-<Language>zh</Language>
-</OpenSearchDescription>

data/shaders/dim-window.glsl

@@ -1,27 +0,0 @@
-#version 110
-uniform sampler2D tex;
-uniform float fraction;
-uniform float height;
-const float c = -0.2;
-const float border_max_height = 60.0;
-
-mat4 contrast = mat4 (1.0 + c, 0.0, 0.0, 0.0,
-                      0.0, 1.0 + c, 0.0, 0.0,
-                      0.0, 0.0, 1.0 + c, 0.0,
-                      0.0, 0.0, 0.0, 1.0);
-vec4 off = vec4(0.633, 0.633, 0.633, 0);
-void main()
-{
-  vec4 color = texture2D(tex, cogl_tex_coord_in[0].xy);
-  float y = height * cogl_tex_coord_in[0].y;
-
-  // To reduce contrast, blend with a mid gray
-  cogl_color_out = color * contrast - off * c * color.a;
-
-  // We only fully dim at a distance of BORDER_MAX_HEIGHT from the top and
-  // when the fraction is 1.0. For other locations and fractions we linearly
-  // interpolate back to the original undimmed color, so the top of the window
-  // is at full color.
-  cogl_color_out = color + (cogl_color_out - color) * max(min(y / border_max_height, 1.0), 0.0);
-  cogl_color_out = color + (cogl_color_out - color) * fraction;
-}

data/theme/calendar-today.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="28"
+   width="29"
-   height="25"
+   height="29"
    id="svg10621"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="calendar-today.svg">
   <defs
      id="defs10623">
@@ -118,6 +118,17 @@
        fx="51"
        fy="30"
        r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -127,20 +138,29 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="15.839192"
-     inkscape:cx="8.3750933"
+     inkscape:cx="20.652108"
-     inkscape:cy="8.0837211"
+     inkscape:cy="11.839084"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1440"
+     inkscape:window-width="1280"
-     inkscape:window-height="843"
+     inkscape:window-height="741"
      inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3109"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata10626">
     <rdf:RDF>
@@ -157,31 +177,28 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-469.08263,-536.99307)">
+     transform="translate(-469.08263,-532.99307)">
-    <g
+    <path
-       id="g3003">
+       sodipodi:type="arc"
-      <path
+       style="opacity:0.4625;color:#000000;fill:url(#radialGradient3113);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:export-ydpi="90"
+       id="path34506-3"
-         inkscape:export-xdpi="90"
+       sodipodi:cx="51"
-         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+       sodipodi:cy="30"
-         transform="matrix(0.43692393,0,0,1.3783114,460.60467,517.48289)"
+       sodipodi:rx="42"
-         sodipodi:end="6.2831853"
+       sodipodi:ry="16"
-         sodipodi:start="3.1415927"
+       d="M 9,29.999999 A 42,16 0 0 1 93,30 l -42,0 z"
-         d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
+       sodipodi:start="3.1415927"
-         sodipodi:ry="16"
+       sodipodi:end="6.2831853"
-         sodipodi:rx="42"
+       transform="matrix(0.43692393,0,0,1.3783114,461.29951,517.6437)"
-         sodipodi:cy="30"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-         sodipodi:cx="51"
+       inkscape:export-xdpi="90"
-         id="path34506-3"
+       inkscape:export-ydpi="90" />
-         style="opacity:0.4625;color:#000000;fill:url(#radialGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+    <rect
-         sodipodi:type="arc" />
+       style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-      <rect
+       id="rect2996"
-         y="558.85046"
+       width="31"
-         x="468.96878"
+       height="3"
-         height="3.1425927"
+       x="468.08264"
-         width="28.149134"
+       y="558.99304" />
-         id="rect2996"
-         style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
   </g>
 </svg>

data/theme/checkbox-focused.svg

@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox.svg">
+  <defs
+     id="defs3201">
+    <linearGradient
+       id="linearGradient15404"
+       inkscape:collect="always">
+      <stop
+         id="stop15406"
+         offset="0"
+         style="stop-color:#515151;stop-opacity:1" />
+      <stop
+         id="stop15408"
+         offset="1"
+         style="stop-color:#292929;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5872-5-1"
+       id="linearGradient5891-0-4"
+       gradientUnits="userSpaceOnUse"
+       x1="205.84143"
+       y1="246.7094"
+       x2="206.74803"
+       y2="231.24142" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5872-5-1">
+      <stop
+         style="stop-color:#0b2e52;stop-opacity:1"
+         offset="0"
+         id="stop5874-4-4" />
+      <stop
+         style="stop-color:#1862af;stop-opacity:1"
+         offset="1"
+         id="stop5876-0-5" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837-4-6"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect14768"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884-4-7"
+       is_visible="true" />
+    <linearGradient
+       y2="-388.72955"
+       x2="-93.031357"
+       y1="-396.34738"
+       x1="-93.031357"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14219"
+       xlink:href="#linearGradient15404"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10013-4-63-6">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop10015-2-76-1" />
+      <stop
+         style="stop-color:#292929;stop-opacity:1"
+         offset="1"
+         id="stop10017-46-15-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10597-5">
+      <stop
+         style="stop-color:#16191a;stop-opacity:1;"
+         offset="0"
+         id="stop10599-2" />
+      <stop
+         style="stop-color:#2b3133;stop-opacity:1"
+         offset="1"
+         id="stop10601-5" />
+    </linearGradient>
+    <linearGradient
+       y2="-322.16354"
+       x2="921.22498"
+       y1="-330.05121"
+       x1="921.32812"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15374"
+       xlink:href="#linearGradient10013-4-63-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-1199.9852,216.38048)"
+       y2="-227.07961"
+       x2="1203.9177"
+       y1="-217.56708"
+       x1="1203.9177"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15376"
+       xlink:href="#linearGradient10597-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="-388.72955"
+       x2="-93.031357"
+       y1="-396.34738"
+       x1="-93.031357"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14219-6"
+       xlink:href="#linearGradient15404-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient15404-9"
+       inkscape:collect="always">
+      <stop
+         id="stop15406-6"
+         offset="0"
+         style="stop-color:#515151;stop-opacity:1" />
+      <stop
+         id="stop15408-7"
+         offset="1"
+         style="stop-color:#292929;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#2d2d2d"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="71.516955"
+     inkscape:cy="5.8710559"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1412"
+     inkscape:window-height="1067"
+     inkscape:window-x="2635"
+     inkscape:window-y="226"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid14843"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-342.5,-521.36218)">
+    <g
+       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
+       id="g14586-0"
+       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         id="g15291-9-6"
+         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
+        <g
+           transform="translate(877.50354,-102.83507)"
+           id="g16853-4-9"
+           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
+          <rect
+             transform="scale(1,-1)"
+             style="color:#000000;fill:url(#linearGradient14219-6);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;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:new"
+             id="rect6506-6"
+             width="11.281681"
+             height="11.26221"
+             x="-409.59354"
+             y="-284.40115"
+             rx="1.0052766"
+             ry="1.0052764" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="translate(343.99999,987.99997)"
+         id="g5886-5"
+         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
+    </g>
+    <g
+       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
+       id="g14586">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         id="g15291-9"
+         style="display:inline;enable-background:new">
+        <g
+           transform="translate(877.50354,-102.83507)"
+           id="g16853-4"
+           style="enable-background:new" />
+      </g>
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="translate(343.99999,987.99997)"
+         id="g5886"
+         style="display:inline;enable-background:new">
+        <path
+           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
+           id="path5835"
+           inkscape:path-effect="#path-effect5837-4-6"
+           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
+           inkscape:path-effect="#path-effect5837-4-6"
+           id="path5880"
+           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
+           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
+           id="path5882"
+           inkscape:path-effect="#path-effect5884-4-7"
+           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csccc" />
+      </g>
+    </g>
+  </g>
+</svg>

data/theme/checkbox-off-focused.svg

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-off.svg">
+  <defs
+     id="defs3201">
+    <linearGradient
+       id="linearGradient15404"
+       inkscape:collect="always">
+      <stop
+         id="stop15406"
+         offset="0"
+         style="stop-color:#515151;stop-opacity:1" />
+      <stop
+         id="stop15408"
+         offset="1"
+         style="stop-color:#292929;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837-4-6"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect14768"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884-4-7"
+       is_visible="true" />
+    <linearGradient
+       y2="-388.72955"
+       x2="-93.031357"
+       y1="-396.34738"
+       x1="-93.031357"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14219"
+       xlink:href="#linearGradient15404"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10013-4-63-6">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop10015-2-76-1" />
+      <stop
+         style="stop-color:#292929;stop-opacity:1"
+         offset="1"
+         id="stop10017-46-15-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10597-5">
+      <stop
+         style="stop-color:#16191a;stop-opacity:1;"
+         offset="0"
+         id="stop10599-2" />
+      <stop
+         style="stop-color:#2b3133;stop-opacity:1"
+         offset="1"
+         id="stop10601-5" />
+    </linearGradient>
+    <linearGradient
+       y2="-322.16354"
+       x2="921.22498"
+       y1="-330.05121"
+       x1="921.32812"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15374"
+       xlink:href="#linearGradient10013-4-63-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-1199.9852,216.38048)"
+       y2="-227.07961"
+       x2="1203.9177"
+       y1="-217.56708"
+       x1="1203.9177"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15376"
+       xlink:href="#linearGradient10597-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#2d2d2d"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="6.1225392"
+     inkscape:cy="3.6003241"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1412"
+     inkscape:window-height="1067"
+     inkscape:window-x="2116"
+     inkscape:window-y="261"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid14843"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-342.5,-521.36218)">
+    <g
+       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
+       id="g14586"
+       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         id="g15291-9"
+         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
+        <g
+           transform="translate(877.50354,-102.83507)"
+           id="g16853-4"
+           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
+          <rect
+             transform="scale(1,-1)"
+             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;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:new"
+             id="rect6506-6"
+             width="11.281681"
+             height="11.26221"
+             x="-409.59354"
+             y="-284.40115"
+             rx="1.0052766"
+             ry="1.0052764" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="translate(343.99999,987.99997)"
+         id="g5886"
+         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
+    </g>
+  </g>
+</svg>

data/theme/checkbox-off.svg

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox.svg">
+  <defs
+     id="defs3201">
+    <linearGradient
+       id="linearGradient15404"
+       inkscape:collect="always">
+      <stop
+         id="stop15406"
+         offset="0"
+         style="stop-color:#515151;stop-opacity:1" />
+      <stop
+         id="stop15408"
+         offset="1"
+         style="stop-color:#292929;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5872-5-1"
+       id="linearGradient5891-0-4"
+       gradientUnits="userSpaceOnUse"
+       x1="205.84143"
+       y1="246.7094"
+       x2="206.74803"
+       y2="231.24142" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5872-5-1">
+      <stop
+         style="stop-color:#0b2e52;stop-opacity:1"
+         offset="0"
+         id="stop5874-4-4" />
+      <stop
+         style="stop-color:#1862af;stop-opacity:1"
+         offset="1"
+         id="stop5876-0-5" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837-4-6"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect14768"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884-4-7"
+       is_visible="true" />
+    <linearGradient
+       y2="-388.72955"
+       x2="-93.031357"
+       y1="-396.34738"
+       x1="-93.031357"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14219"
+       xlink:href="#linearGradient15404"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10013-4-63-6">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop10015-2-76-1" />
+      <stop
+         style="stop-color:#292929;stop-opacity:1"
+         offset="1"
+         id="stop10017-46-15-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10597-5">
+      <stop
+         style="stop-color:#16191a;stop-opacity:1;"
+         offset="0"
+         id="stop10599-2" />
+      <stop
+         style="stop-color:#2b3133;stop-opacity:1"
+         offset="1"
+         id="stop10601-5" />
+    </linearGradient>
+    <linearGradient
+       y2="-322.16354"
+       x2="921.22498"
+       y1="-330.05121"
+       x1="921.32812"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15374"
+       xlink:href="#linearGradient10013-4-63-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-1199.9852,216.38048)"
+       y2="-227.07961"
+       x2="1203.9177"
+       y1="-217.56708"
+       x1="1203.9177"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15376"
+       xlink:href="#linearGradient10597-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#2d2d2d"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="71.247925"
+     inkscape:cy="33.339093"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1412"
+     inkscape:window-height="1067"
+     inkscape:window-x="2116"
+     inkscape:window-y="261"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid14843"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-342.5,-521.36218)">
+    <g
+       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
+       id="g14586">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         id="g15291-9"
+         style="display:inline;enable-background:new">
+        <g
+           transform="translate(877.50354,-102.83507)"
+           id="g16853-4"
+           style="enable-background:new">
+          <rect
+             transform="scale(1,-1)"
+             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;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:new"
+             id="rect6506-6"
+             width="11.281681"
+             height="11.26221"
+             x="-409.59354"
+             y="-284.40115"
+             rx="0.95632279"
+             ry="0.95632273" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="translate(343.99999,987.99997)"
+         id="g5886"
+         style="display:inline;enable-background:new" />
+    </g>
+  </g>
+</svg>

data/theme/checkbox.svg

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="checkbox-focused.svg">
+  <defs
+     id="defs3201">
+    <linearGradient
+       id="linearGradient15404"
+       inkscape:collect="always">
+      <stop
+         id="stop15406"
+         offset="0"
+         style="stop-color:#515151;stop-opacity:1" />
+      <stop
+         id="stop15408"
+         offset="1"
+         style="stop-color:#292929;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5872-5-1"
+       id="linearGradient5891-0-4"
+       gradientUnits="userSpaceOnUse"
+       x1="205.84143"
+       y1="246.7094"
+       x2="206.74803"
+       y2="231.24142" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5872-5-1">
+      <stop
+         style="stop-color:#0b2e52;stop-opacity:1"
+         offset="0"
+         id="stop5874-4-4" />
+      <stop
+         style="stop-color:#1862af;stop-opacity:1"
+         offset="1"
+         id="stop5876-0-5" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5837-4-6"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect14768"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect5884-4-7"
+       is_visible="true" />
+    <linearGradient
+       y2="-388.72955"
+       x2="-93.031357"
+       y1="-396.34738"
+       x1="-93.031357"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14219"
+       xlink:href="#linearGradient15404"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10013-4-63-6">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop10015-2-76-1" />
+      <stop
+         style="stop-color:#292929;stop-opacity:1"
+         offset="1"
+         id="stop10017-46-15-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10597-5">
+      <stop
+         style="stop-color:#16191a;stop-opacity:1;"
+         offset="0"
+         id="stop10599-2" />
+      <stop
+         style="stop-color:#2b3133;stop-opacity:1"
+         offset="1"
+         id="stop10601-5" />
+    </linearGradient>
+    <linearGradient
+       y2="-322.16354"
+       x2="921.22498"
+       y1="-330.05121"
+       x1="921.32812"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15374"
+       xlink:href="#linearGradient10013-4-63-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-1199.9852,216.38048)"
+       y2="-227.07961"
+       x2="1203.9177"
+       y1="-217.56708"
+       x1="1203.9177"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15376"
+       xlink:href="#linearGradient10597-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#2d2d2d"
+     borderopacity="1"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="64.516955"
+     inkscape:cy="13.871056"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1412"
+     inkscape:window-height="1067"
+     inkscape:window-x="2635"
+     inkscape:window-y="226"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid14843"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-342.5,-521.36218)">
+    <g
+       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
+       id="g14586">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         id="g15291-9"
+         style="display:inline;enable-background:new">
+        <g
+           transform="translate(877.50354,-102.83507)"
+           id="g16853-4"
+           style="enable-background:new">
+          <rect
+             transform="scale(1,-1)"
+             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;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:new"
+             id="rect6506-6"
+             width="11.281681"
+             height="11.26221"
+             x="-409.59354"
+             y="-284.40115"
+             rx="0.95632279"
+             ry="0.95632273" />
+        </g>
+      </g>
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         transform="translate(343.99999,987.99997)"
+         id="g5886"
+         style="display:inline;enable-background:new">
+        <path
+           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
+           id="path5835"
+           inkscape:path-effect="#path-effect5837-4-6"
+           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
+           inkscape:path-effect="#path-effect5837-4-6"
+           id="path5880"
+           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
+           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
+           id="path5882"
+           inkscape:path-effect="#path-effect5884-4-7"
+           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csccc" />
+      </g>
+    </g>
+  </g>
+</svg>

data/theme/gdm.css

@@ -1,180 +0,0 @@
-/* Copyright 2011, Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* Login Dialog */
-
-.login-dialog-title {
-    font-size: 14pt;
-    font-weight: bold;
-    color: #666666;
-    padding-bottom: 2em;
-}
-
-.login-dialog {
-    border-radius: 16px;
-    min-height: 150px;
-    max-height: 700px;
-    min-width: 350px;
-}
-
-.login-dialog-prompt-fingerprint-message {
-    font-size: 10.5pt;
-}
-
-.login-dialog-user-list-view {
-    -st-vfade-offset: 1em;
-}
-
-.login-dialog-user-list {
-    spacing: 12px;
-}
-
-.login-dialog-user-list-item {
-    color: #666666;
-}
-
-.login-dialog-user-list-item:ltr {
-    padding-right: 1em;
-}
-
-.login-dialog-user-list-item:rtl {
-    padding-left: 1em;
-}
-
-.login-dialog-user-list-item .login-dialog-user-list-item-name {
-    font-size: 20pt;
-    padding-left: 1em;
-    color: #666666;
-}
-
-.login-dialog-user-list-item:hover .login-dialog-user-list-item-name {
-    color: white;
-}
-
-.login-dialog-user-list-item:focus .login-dialog-user-list-item-name {
-    color: white;
-    text-shadow: black 0px 2px 2px;
-}
-
-.login-dialog-user-list-item-vertical-layout {
-    spacing: 2px;
-}
-
-.login-dialog-user-list-item .login-dialog-user-list-item-focus-bin {
-    background-color: rgba(0,0,0,0.0);
-    height: 2px;
-}
-
-.login-dialog-user-list-item:focus .login-dialog-user-list-item-focus-bin {
-    background-color: #666666;
-}
-
-.login-dialog-user-list-item-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 8px;
-    width: 64px;
-    height: 64px;
-}
-
-.login-dialog-not-listed-button {
-    padding-top: 2em;
-}
-.login-dialog-not-listed-label {
-    font-size: 14pt;
-    font-weight: bold;
-    color: #666666;
-}
-
-.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
-    color: white;
-}
-
-.login-dialog-prompt-layout {
-    padding-bottom: 32px;
-}
-.login-dialog-prompt-label {
-    color: white;
-    font-size: 20pt;
-}
-
-.login-dialog-prompt-entry {
-    padding: 4px;
-    border-radius: 4px;
-    border: 2px solid #5656cc;
-    color: black;
-    background-color: white;
-    caret-color: black;
-    caret-size: 1px;
-    width: 15em;
-}
-
-.login-dialog-prompt-entry .capslock-warning {
-    icon-size: 16px;
-    warning-color: #999;
-}
-
-.login-dialog-prompt-entry:insensitive {
-    color: rgba(0,0,0,0.7);
-    border: 2px solid #565656;
-}
-
-.login-dialog-session-list {
-    color: #ffffff;
-    font-size: 10.5pt;
-}
-
-.login-dialog-session-list-button {
-    padding: 4px;
-}
-
-.login-dialog-session-list-button:focus {
-    background-color: #4c4c4c;
-}
-
-.login-dialog-session-list-button:active {
-    background-color: #4c4c4c;
-}
-
-.login-dialog-session-list-button:hover {
-    font-weight: bold;
-}
-
-.login-dialog-session-list-scroll-view {
-    background-gradient-start: rgba(80,80,80,0.3);
-    background-gradient-end: rgba(80,80,80,0.7);
-    background-gradient-direction: vertical;
-    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
-    border-radius: 8px;
-    border: 1px solid rgba(80,80,80,1.0);
-    padding: .5em;
-}
-
-.login-dialog-session-list-item:focus {
-    background-color: #666666;
-}
-
-.login-dialog-session-list-triangle {
-    padding-right: .5em;
-}
-
-.login-dialog-session-list-item-box {
-    spacing: .25em;
-}
-
-.login-dialog-session-list-item-dot {
-    width: .75em;
-    height: .75em;
-}

data/theme/logged-in-indicator.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300"
+   height="80"
+   id="svg7355"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="logged-in-indicator.svg">
+  <metadata
+     id="metadata4175">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2c1cff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     id="namedview4173"
+     showgrid="false"
+     inkscape:zoom="2.8760889"
+     inkscape:cx="106.00403"
+     inkscape:cy="80.68078"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g30864" />
+  <defs
+     id="defs7357">
+    <radialGradient
+       xlink:href="#linearGradient36429"
+       id="radialGradient7461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.5919312,0,0,0.57582113,-20.687059,48.400487)"
+       cx="47.428951"
+       cy="167.16817"
+       fx="47.428951"
+       fy="167.16817"
+       r="37" />
+    <linearGradient
+       id="linearGradient36429">
+      <stop
+         id="stop36431"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36433"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient36471"
+       id="radialGradient7463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891549,0,0,0.55513246,-9.281289,36.12653)"
+       cx="49.067139"
+       cy="242.50381"
+       fx="49.067139"
+       fy="242.50381"
+       r="37.00671" />
+    <linearGradient
+       id="linearGradient36471">
+      <stop
+         id="stop36473"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36475"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="37.00671"
+       fy="242.50381"
+       fx="49.067139"
+       cy="242.50381"
+       cx="49.067139"
+       gradientTransform="matrix(3.4218418,0,0,0.03365337,-61.309005,138.5071)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7488"
+       xlink:href="#linearGradient36471" />
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
+    <g
+       style="display:inline"
+       id="g30864"
+       transform="translate(255.223,70.118091)">
+      <rect
+         ry="3.4593496"
+         rx="8.8641119"
+         y="76.159348"
+         x="12.596948"
+         height="71.116341"
+         width="182.22595"
+         id="rect14000"
+         style="opacity:0.371875;fill:url(#radialGradient7461);fill-opacity:1;stroke:none" />
+      <path
+         id="rect34520"
+         d="m 194.80022,146.83551 -182.559919,0"
+         style="opacity:0.35;fill:none;stroke:url(#radialGradient7488);stroke-width:0.61184424;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         connector-curvature="0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>

data/theme/more-results.svg

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg12430"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="more-results.svg">
+  <defs
+     id="defs12432" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#7a7a7a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="8.3155237"
+     inkscape:cy="0.89548874"
+     inkscape:document-units="px"
+     inkscape:current-layer="g14642-3-0"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-x="1200"
+     inkscape:window-y="187"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid13002" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata12435">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       style="display:inline"
+       transform="translate(-141.99984,638.37113)"
+       inkscape:label="zoom-in"
+       id="g14642-3-0">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0"
+         inkscape:original="M 145.1875 400 C 144.5248 400 144 400.54899 144 401.21875 L 144 410.78125 C 144 411.45101 144.5248 412 145.1875 412 L 154.8125 412 C 155.4752 412 156 411.45101 156 410.78125 L 156 401.21875 C 156 400.54899 155.4752 400 154.8125 400 L 145.1875 400 z M 149 403 L 151 403 L 151 405 L 153 405 L 153 407 L 151 407 L 151 409 L 149 409 L 149 407 L 147 407 L 147 405 L 149 405 L 149 403 z "
+         xlink:href="#rect11749-5-0-1-8"
+         style="color:#bebebe;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;opacity:0.8"
+         id="path13004"
+         inkscape:href="#rect11749-5-0-1-8"
+         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
+         transform="translate(0,1)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path13004"
+         id="use11960"
+         transform="translate(1,-1)"
+         width="16"
+         height="16" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use11960"
+         id="use11962"
+         transform="translate(-2,0)"
+         width="16"
+         height="16" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
+         id="rect11749-5-0-1-8" />
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3620-5-4"
+         width="15.981825"
+         height="16"
+         x="142"
+         y="398"
+         rx="0"
+         ry="0" />
+    </g>
+  </g>
+</svg>

data/theme/panel-border.svg

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="3"
-   height="10"
-   id="svg2"
-   version="1.1">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-  </metadata>
-  <g
-     id="layer1">
-    <rect
-       style="fill:#000000;fill-opacity:1;stroke-width:0.43599999000000000;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3779"
-       width="3"
-       height="10"
-       x="0"
-       y="0" />
-    <rect
-       style="fill:#536272;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="3"
-       height="1"
-       x="0"
-       y="9" />
-  </g>
-</svg>

data/theme/panel-button-border.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="21"
+   width="17"
    height="10"
    id="svg2"
    version="1.1"
@@ -66,9 +66,9 @@
     <rect
        style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect3796"
-       width="3"
+       width="7"
        height="2"
-       x="9"
+       x="5"
        y="8" />
   </g>
 </svg>

data/theme/scroll-hhandle.svg

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="4"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="scroll-hhandle.svg">
-  <defs
-     id="defs4">
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect3592"
-       width="2"
-       height="4"
-       x="0"
-       y="0"
-       rx="0"
-       ry="0" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#rect3592"
-       id="use2825"
-       transform="translate(8,0)"
-       width="10"
-       height="4" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use2825"
-       id="use2827"
-       transform="translate(-4,0)"
-       width="10"
-       height="4" />
-  </g>
-</svg>

data/theme/scroll-vhandle.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4"
-   height="10"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="scroll-hhandle.svg">
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect3592"
-       width="2"
-       height="4"
-       x="0"
-       y="-4"
-       rx="0"
-       ry="0"
-       transform="matrix(0,1,-1,0,0,0)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#rect3592"
-       id="use3705"
-       transform="translate(0,4)"
-       width="4"
-       height="10" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use3705"
-       id="use3707"
-       transform="translate(0,4)"
-       width="4"
-       height="10" />
-  </g>
-</svg>

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>

data/theme/toggle-off-intl.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
+   width="65"
    height="22"
    id="svg3273"
    version="1.1"

data/theme/toggle-off-us.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
+   width="65"
    height="22"
    id="svg3012"
    version="1.1"

data/theme/ws-switch-arrow-down.svg

@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="96"
-   height="96"
-   id="svg25070"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-down.svg">
-  <metadata
-     id="metadata3353">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="718"
-     inkscape:window-height="480"
-     id="namedview3351"
-     showgrid="false"
-     inkscape:zoom="2.6979167"
-     inkscape:cx="48"
-     inkscape:cy="48"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25070" />
-  <defs
-     id="defs25072">
-    <linearGradient
-       x1="-86.552246"
-       y1="185.439"
-       x2="-83.37072"
-       y2="197.31261"
-       id="linearGradient24957"
-       xlink:href="#linearGradient4034-0-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6,0)" />
-    <linearGradient
-       id="linearGradient4034-0-4">
-      <stop
-         id="stop4036-5-7"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4038-9-6"
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter24765">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix24767" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix24769" />
-    </filter>
-    <linearGradient
-       x1="-74.520325"
-       y1="169.06032"
-       x2="-74.520325"
-       y2="205.94189"
-       id="linearGradient24955"
-       xlink:href="#linearGradient4632-1-3-9-3-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,0)" />
-    <linearGradient
-       id="linearGradient4632-1-3-9-3-2">
-      <stop
-         id="stop4634-1-8-3-9-0"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4636-1-9-9-8-8"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.0274937" />
-      <stop
-         id="stop4638-8-3-9-6-6"
-         style="stop-color:#f2f2f2;stop-opacity:1"
-         offset="0.274937" />
-      <stop
-         id="stop4640-8-5-7-8-9"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.38707438" />
-      <stop
-         id="stop4642-5-41-9-6-9"
-         style="stop-color:#d9dad8;stop-opacity:1"
-         offset="0.66528589" />
-      <stop
-         id="stop4644-5-2-7-9-2"
-         style="stop-color:#dfe0dd;stop-opacity:1"
-         offset="0.76745707" />
-      <stop
-         id="stop4646-3-2-3-7-3"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="-33.412369"
-       cy="185.74171"
-       r="2.3554697"
-       fx="-33.412369"
-       fy="185.74171"
-       id="radialGradient24959"
-       xlink:href="#linearGradient4869-4-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
-    <linearGradient
-       id="linearGradient4869-4-1">
-      <stop
-         id="stop4871-6-2"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4879-7-4"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.31807542" />
-      <stop
-         id="stop4877-6-1"
-         style="stop-color:#c8c9c6;stop-opacity:1"
-         offset="0.74691135" />
-      <stop
-         id="stop4873-1-0"
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25011">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25013" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25015" />
-    </filter>
-    <radialGradient
-       cx="-33.412369"
-       cy="185.74171"
-       r="2.3554697"
-       fx="-33.412369"
-       fy="185.74171"
-       id="radialGradient24961"
-       xlink:href="#linearGradient4869-4-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
-    <linearGradient
-       id="linearGradient4869-4-0">
-      <stop
-         id="stop4871-6-8"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4879-7-5"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0.31807542" />
-      <stop
-         id="stop4877-6-5"
-         style="stop-color:#c8c9c6;stop-opacity:1"
-         offset="0.74691135" />
-      <stop
-         id="stop4873-1-4"
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25023">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25025" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25027" />
-    </filter>
-    <linearGradient
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898"
-       id="linearGradient24963"
-       xlink:href="#linearGradient4941"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4941">
-      <stop
-         id="stop4943"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4945"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25033">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25035" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25037" />
-    </filter>
-    <linearGradient
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898"
-       id="linearGradient24965"
-       xlink:href="#linearGradient4941-7"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4941-7">
-      <stop
-         id="stop4943-2"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4945-5"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25043">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25045" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25047" />
-    </filter>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25049">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25051" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25053" />
-    </filter>
-    <filter
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       color-interpolation-filters="sRGB"
-       id="filter25055">
-      <feColorMatrix
-         result="fbSourceGraphic"
-         values="1"
-         type="saturate"
-         id="feColorMatrix25057" />
-      <feColorMatrix
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
-         in="fbSourceGraphic"
-         id="feColorMatrix25059" />
-    </filter>
-  </defs>
-  <g
-     transform="matrix(0,1,-1,0,48.0003,4.1307112e-7)"
-     id="layer1">
-    <g
-       transform="matrix(-2,0,0,2,-97.2497,-374.967)"
-       id="g4030-1-8"
-       style="stroke:#000000;stroke-opacity:1;display:inline">
-      <path
-         d="m -72.5,173.5 -14,14 14,14"
-         id="path3165-7-3"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
-       transform="matrix(-3.34328,0,0,3.34328,-89.2797,-623.176)"
-       id="path4050-2-7-9-4"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
-       transform="matrix(-3.34328,0,0,3.34328,-111.2797,-623.176)"
-       id="path4050-2-7-9-4-8"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
-       transform="matrix(-2.86565,0,0,2.86565,-70.8457,-534.143)"
-       id="path4050-2-7-9-4-0"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
-       transform="matrix(-2.86565,0,0,2.86565,-92.8457,-534.143)"
-       id="path4050-2-7-9-4-0-9"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 47.87528,-34.0295 c 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25 -32.25,32.25 c -2.2253,2.2253 -6.2747,2.2253 -8.5,0 -2.2253,-2.22528 -2.2253,-6.2747 0,-8.5 l 23.75,-23.75 -23.75,-23.75 c -1.73168,-1.6731 -2.295,-4.44228 -1.3546,-6.65894 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 z"
-       id="path3165-7-3-1"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 41.8316,28.09418 c -0.014,-1.58898 0.54158,-3.18406 1.66868,-4.31118 l 23.75,-23.75 m -25.1046,-30.40894 c 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25"
-       id="path3165-7-3-1-9"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

data/theme/ws-switch-arrow-up.svg

@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg25070"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-up.svg">
-  <defs
-     id="defs25072">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective25078" />
-    <inkscape:perspective
-       id="perspective24985"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4034-0-4"
-       id="linearGradient24957"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6)"
-       x1="-86.552246"
-       y1="185.439"
-       x2="-83.37072"
-       y2="197.31261" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4034-0-4">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4036-5-7" />
-      <stop
-         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;"
-         offset="1"
-         id="stop4038-9-6" />
-    </linearGradient>
-    <filter
-       id="filter24765"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix24767"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix24769"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4632-1-3-9-3-2"
-       id="linearGradient24955"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5)"
-       x1="-74.520325"
-       y1="169.06032"
-       x2="-74.520325"
-       y2="205.94189" />
-    <linearGradient
-       id="linearGradient4632-1-3-9-3-2">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4634-1-8-3-9-0" />
-      <stop
-         id="stop4636-1-9-9-8-8"
-         offset="0.0274937"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
-      <stop
-         id="stop4638-8-3-9-6-6"
-         offset="0.274937"
-         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
-      <stop
-         id="stop4640-8-5-7-8-9"
-         offset="0.38707438"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4642-5-41-9-6-9"
-         offset="0.66528589"
-         style="stop-color: rgb(217, 218, 216); stop-opacity: 1;" />
-      <stop
-         id="stop4644-5-2-7-9-2"
-         offset="0.76745707"
-         style="stop-color: rgb(223, 224, 221); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(240, 240, 240); stop-opacity: 1;"
-         offset="1"
-         id="stop4646-3-2-3-7-3" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-1"
-       id="radialGradient24959"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-1">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-2" />
-      <stop
-         id="stop4879-7-4"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-1"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-0" />
-    </linearGradient>
-    <filter
-       id="filter25011"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25013"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25015"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-0"
-       id="radialGradient24961"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-0">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-8" />
-      <stop
-         id="stop4879-7-5"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-5"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-4" />
-    </linearGradient>
-    <filter
-       id="filter25023"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25025"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25027"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941"
-       id="linearGradient24963"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945" />
-    </linearGradient>
-    <filter
-       id="filter25033"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25035"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25037"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941-7"
-       id="linearGradient24965"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941-7">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943-2" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945-5" />
-    </linearGradient>
-    <filter
-       id="filter25043"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25045"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25047"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25049"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25051"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25053"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25055"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25057"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25059"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-12.356322"
-     inkscape:cy="57.536221"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1200"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata25075">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0, 48)">
-    <g
-       id="g3181"
-       transform="matrix(0,1,-1,0,48.0003,-48)">
-      <g
-         style="stroke:#000000;stroke-opacity:1;display:inline"
-         transform="matrix(2,0,0,2,193.25,-374.967)"
-         id="g4030-1-8">
-        <path
-           style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-           d="m -72.5,173.5 -14,14 14,14"
-           id="path3165-7-3"
-           sodipodi:nodetypes="ccc"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         transform="matrix(3.34328,0,0,3.34328,185.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(3.34328,0,0,3.34328,207.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-8"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2.86565,0,0,2.86565,166.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2.86565,0,0,2.86565,188.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0-9"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccscccsc"
-         id="path3165-7-3-1"
-         d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccccc"
-         id="path3165-7-3-1-9"
-         d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>

docs/reference/shell/Makefile.am

@@ -18,11 +18,10 @@ DOC_MODULE=shell
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# Directories containing the source code, relative to $(srcdir).
+# Directories containing the source code
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=$(top_srcdir)/src
-DOC_SOURCE_DIR=../../../src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -58,15 +57,42 @@ EXTRA_HFILES=
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES=calendar-server gvc hotplug-sniffer st tray
+IGNORE_HFILES=					\
+	calendar-server				\
+	gvc					\
+	hotplug-sniffer				\
+	st					\
+	tray					\
+	gactionmuxer.h				\
+	gactionobservable.h			\
+	gactionobserver.h			\
+	shell-recorder-src.h
+
+if !BUILD_RECORDER
+IGNORE_HFILES += shell-recorder.h
+endif
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
 
+doc-gen-org.gnome.Shell.SearchProvider.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
+	gdbus-codegen 						\
+	--interface-prefix org.gnome.ShellSearchProvider. 	\
+	--generate-docbook doc-gen				\
+	$(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
+
+doc-gen-org.gnome.Shell.SearchProvider2.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
+	gdbus-codegen 						\
+	--interface-prefix org.gnome.ShellSearchProvider2. 	\
+	--generate-docbook doc-gen				\
+	$(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files= \
+	doc-gen-org.gnome.Shell.SearchProvider.xml	\
+	doc-gen-org.gnome.Shell.SearchProvider2.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -79,7 +105,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell.la
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

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

@@ -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,10 +40,11 @@
   <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>
+    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
+    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
     <xi:include href="xml/shell-global.xml"/>
     <xi:include href="xml/shell-wm.xml"/>
     <xi:include href="xml/shell-xfixes-cursor.xml"/>

docs/reference/st/Makefile.am

@@ -18,11 +18,10 @@ DOC_MODULE=st
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# Directories containing the source code, relative to $(srcdir).
+# Directories containing the source code
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=$(top_srcdir)/src/st
-DOC_SOURCE_DIR=../../../src/st
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=

docs/reference/st/st-docs.sgml.in

@@ -20,7 +20,6 @@
       <title>Abstract classes and Interfaces</title>
       <xi:include href="xml/st-widget.xml"/>
       <xi:include href="xml/st-widget-accessible.xml"/>
-      <xi:include href="xml/st-container.xml"/>
       <xi:include href="xml/st-scrollable.xml"/>
     </chapter>
     <chapter id="widgets">
@@ -30,14 +29,11 @@
       <xi:include href="xml/st-entry.xml"/>
       <xi:include href="xml/st-icon.xml"/>
       <xi:include href="xml/st-label.xml"/>
-      <xi:include href="xml/st-tooltip.xml"/>
     </chapter>
     <chapter id="containers">
       <title>Containers</title>
       <xi:include href="xml/st-bin.xml"/>
       <xi:include href="xml/st-box-layout.xml"/>
-      <xi:include href="xml/st-group.xml"/>
-      <xi:include href="xml/st-overflow-box.xml"/>
       <xi:include href="xml/st-scroll-view.xml"/>
       <xi:include href="xml/st-table.xml"/>
     </chapter>

gnome-shell.doap

@@ -52,13 +52,6 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>walters</gnome:userid>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Dan Winship</foaf:name>
-      <foaf:mbox rdf:resource="mailto:danw@gnome.org" />
-      <gnome:userid>danw</gnome:userid>
-    </foaf:Person>
-  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Marina Zhurakhinskaya</foaf:name>
@@ -66,4 +59,11 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>marinaz</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Florian Müllner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
+      <gnome:userid>fmuellner</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 </Project>

js/Makefile.am

@@ -1,81 +1,110 @@
+NULL =
+
+EXTRA_DIST = misc/config.js.in
+CLEANFILES = misc/config.js
+
+misc/config.js: misc/config.js.in Makefile
+	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
+	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
+	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
+	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
+	    -e "s|[@]datadir@|$(datadir)|g" \
+	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
+	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
+               $< > $@
 
 jsdir = $(pkgdatadir)/js
 
 nobase_dist_js_DATA = 	\
 	gdm/batch.js		\
-	gdm/consoleKit.js	\
 	gdm/fingerprint.js	\
 	gdm/loginDialog.js	\
 	gdm/powerMenu.js	\
+	gdm/realmd.js		\
+	gdm/util.js		\
+	extensionPrefs/main.js	\
 	misc/config.js		\
-	misc/docInfo.js		\
+	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
-	misc/format.js		\
 	misc/gnomeSession.js	\
 	misc/history.js		\
 	misc/jsParse.js		\
+	misc/loginManager.js	\
 	misc/modemManager.js	\
 	misc/params.js		\
-	misc/screenSaver.js     \
 	misc/util.js		\
 	perf/core.js		\
 	ui/altTab.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
-	ui/automountManager.js  \
-	ui/autorunManager.js    \
 	ui/boxpointer.js	\
 	ui/calendar.js		\
-	ui/contactDisplay.js \
+	ui/checkBox.js		\
 	ui/ctrlAltTab.js	\
 	ui/dash.js		\
 	ui/dateMenu.js		\
 	ui/dnd.js		\
-	ui/docDisplay.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/layout.js		\
 	ui/lightbox.js		\
-	ui/link.js		\
 	ui/lookingGlass.js	\
 	ui/magnifier.js		\
 	ui/magnifierDBus.js	\
 	ui/main.js		\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
-	ui/networkAgent.js	\
+	ui/separator.js		\
+	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
 	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		\
+        ui/screenShield.js	\
 	ui/scripting.js		\
 	ui/search.js		\
 	ui/searchDisplay.js	\
 	ui/shellDBus.js		\
-	ui/statusIconDispatcher.js	\
 	ui/status/accessibility.js	\
 	ui/status/keyboard.js	\
+	ui/status/lockScreenMenu.js	\
 	ui/status/network.js	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
-	ui/telepathyClient.js	\
+	ui/switcherPopup.js	\
 	ui/tweener.js		\
+	ui/unlockDialog.js	\
 	ui/userMenu.js		\
 	ui/viewSelector.js	\
+	ui/wanda.js		\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
 	ui/workspaceThumbnail.js	\
 	ui/workspacesView.js	\
 	ui/workspaceSwitcherPopup.js    \
-	ui/xdndHandler.js
+	ui/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

@@ -0,0 +1,270 @@
+
+const Lang = imports.lang;
+const Gettext = imports.gettext;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const Format = imports.format;
+
+const _ = Gettext.gettext;
+
+const Config = imports.misc.config;
+const ExtensionUtils = imports.misc.extensionUtils;
+
+const GnomeShellIface = <interface name="org.gnome.Shell.Extensions">
+<signal name="ExtensionStatusChanged">
+    <arg type="s" name="uuid"/>
+    <arg type="i" name="state"/>
+    <arg type="s" name="error"/>
+</signal>
+</interface>;
+
+const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
+
+function stripPrefix(string, prefix) {
+    if (string.slice(0, prefix.length) == prefix)
+        return string.slice(prefix.length);
+    return string;
+}
+
+const Application = new Lang.Class({
+    Name: 'Application',
+    _init: function() {
+        GLib.set_prgname('gnome-shell-extension-prefs');
+        this.application = new Gtk.Application({
+            application_id: 'org.gnome.shell.ExtensionPrefs',
+            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
+        });
+
+        this.application.connect('activate', Lang.bind(this, this._onActivate));
+        this.application.connect('command-line', Lang.bind(this, this._onCommandLine));
+        this.application.connect('startup', Lang.bind(this, this._onStartup));
+
+        this._extensionPrefsModules = {};
+
+        this._extensionIters = {};
+    },
+
+    _buildModel: function() {
+        this._model = new Gtk.ListStore();
+        this._model.set_column_types([GObject.TYPE_STRING, GObject.TYPE_STRING]);
+    },
+
+    _extensionAvailable: function(uuid) {
+        let extension = ExtensionUtils.extensions[uuid];
+
+        if (!extension)
+            return false;
+
+        if (ExtensionUtils.isOutOfDate(extension))
+            return false;
+
+        if (!extension.dir.get_child('prefs.js').query_exists(null))
+            return false;
+
+        return true;
+    },
+
+    _setExtensionInsensitive: function(layout, cell, model, iter, data) {
+        let uuid = model.get_value(iter, 0);
+        cell.set_sensitive(this._extensionAvailable(uuid));
+    },
+
+    _getExtensionPrefsModule: function(extension) {
+        let uuid = extension.metadata.uuid;
+
+        if (this._extensionPrefsModules.hasOwnProperty(uuid))
+            return this._extensionPrefsModules[uuid];
+
+        ExtensionUtils.installImporter(extension);
+
+        let prefsModule = extension.imports.prefs;
+        prefsModule.init(extension.metadata);
+
+        this._extensionPrefsModules[uuid] = prefsModule;
+        return prefsModule;
+    },
+
+    _selectExtension: function(uuid) {
+        if (!this._extensionAvailable(uuid))
+            return;
+
+        let extension = ExtensionUtils.extensions[uuid];
+        let widget;
+
+        try {
+            let prefsModule = this._getExtensionPrefsModule(extension);
+            widget = prefsModule.buildPrefsWidget();
+        } catch (e) {
+            widget = this._buildErrorUI(extension, e);
+        }
+
+        // Destroy the current prefs widget, if it exists
+        if (this._extensionPrefsBin.get_child())
+            this._extensionPrefsBin.get_child().destroy();
+
+        this._extensionPrefsBin.add(widget);
+        this._extensionSelector.set_active_iter(this._extensionIters[uuid]);
+    },
+
+    _extensionSelected: function() {
+        let [success, iter] = this._extensionSelector.get_active_iter();
+        if (!success)
+            return;
+
+        let uuid = this._model.get_value(iter, 0);
+        this._selectExtension(uuid);
+    },
+
+    _buildErrorUI: function(extension, exc) {
+        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
+        let label = new Gtk.Label({
+            label: _("There was an error loading the preferences dialog for %s:").format(extension.metadata.name)
+        });
+        box.add(label);
+
+        let errortext = '';
+        errortext += exc;
+        errortext += '\n\n';
+        errortext += 'Stack trace:\n';
+
+        // Indent stack trace.
+        errortext += exc.stack.split('\n').map(function(line) {
+            return '  ' + line;
+        }).join('\n');
+
+        let scroll = new Gtk.ScrolledWindow({ vexpand: true });
+        let buffer = new Gtk.TextBuffer({ text: errortext });
+        let textview = new Gtk.TextView({ buffer: buffer });
+        textview.override_font(Pango.font_description_from_string('monospace'));
+        scroll.add(textview);
+        box.add(scroll);
+
+        box.show_all();
+        return box;
+    },
+
+    _buildUI: function(app) {
+        this._window = new Gtk.ApplicationWindow({ application: app,
+                                                   window_position: Gtk.WindowPosition.CENTER,
+                                                   title: _("GNOME Shell Extension Preferences") });
+
+        this._window.set_size_request(600, 400);
+
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
+        this._window.add(vbox);
+
+        let toolbar = new Gtk.Toolbar();
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
+        vbox.add(toolbar);
+        let toolitem;
+
+        let label = new Gtk.Label({ label: '<b>' + _("Extension") + '</b>',
+                                    use_markup: true });
+        toolitem = new Gtk.ToolItem({ child: label });
+        toolbar.add(toolitem);
+
+        this._extensionSelector = new Gtk.ComboBox({ model: this._model,
+                                                     margin_left: 8,
+                                                     hexpand: true });
+        this._extensionSelector.get_style_context().add_class(Gtk.STYLE_CLASS_RAISED);
+
+        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));
+        this._extensionSelector.connect('changed', Lang.bind(this, this._extensionSelected));
+
+        toolitem = new Gtk.ToolItem({ child: this._extensionSelector });
+        toolitem.set_expand(true);
+        toolbar.add(toolitem);
+
+        this._extensionPrefsBin = new Gtk.Frame();
+        vbox.add(this._extensionPrefsBin);
+
+        let label = new Gtk.Label({
+            label: _("Select an extension to configure using the combobox above."),
+            vexpand: true
+        });
+
+        this._extensionPrefsBin.add(label);
+
+        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
+        this._shellProxy.connectSignal('ExtensionStatusChanged', Lang.bind(this, function(proxy, senderName, [uuid, state, error]) {
+            if (ExtensionUtils.extensions[uuid] !== undefined)
+                this._scanExtensions();
+        }));
+
+        this._window.show_all();
+    },
+
+    _scanExtensions: function() {
+        let finder = new ExtensionUtils.ExtensionFinder();
+        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
+        finder.scanExtensions();
+    },
+
+    _extensionFound: function(signals, extension) {
+        let iter = this._model.append();
+        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
+        this._extensionIters[extension.uuid] = iter;
+    },
+
+
+    _onActivate: function() {
+        this._window.present();
+    },
+
+    _onStartup: function(app) {
+        this._buildModel();
+        this._buildUI(app);
+        this._scanExtensions();
+    },
+
+    _onCommandLine: function(app, commandLine) {
+        app.activate();
+        let args = commandLine.get_arguments();
+        if (args.length) {
+            let uuid = args[0];
+
+            // Strip off "extension:///" prefix which fakes a URI, if it exists
+            uuid = stripPrefix(uuid, "extension:///");
+
+            if (!this._extensionAvailable(uuid))
+                return 1;
+
+            this._selectExtension(uuid);
+        }
+        return 0;
+    }
+});
+
+function initEnvironment() {
+    // Monkey-patch in a "global" object that fakes some Shell utilities
+    // that ExtensionUtils depends on.
+    window.global = {
+        log: function() {
+            print([].join.call(arguments, ', '));
+        },
+
+        logError: function(s) {
+            log('ERROR: ' + s);
+        },
+
+        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
+    };
+
+    String.prototype.format = Format.format;
+}
+
+function main(argv) {
+    initEnvironment();
+
+    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
+    Gettext.textdomain(Config.GETTEXT_PACKAGE);
+
+    let app = new Application();
+    app.application.run(argv);
+}

js/gdm/batch.js

@@ -21,11 +21,9 @@
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-function Task() {
+const Task = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'Task',
-}
 
-Task.prototype = {
     _init: function(scope, handler) {
         if (scope)
             this.scope = scope;
@@ -41,22 +39,17 @@ Task.prototype = {
 
         return null;
     },
-};
+});
 Signals.addSignalMethods(Task.prototype);
 
-function Hold() {
+const Hold = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'Hold',
-}
+    Extends: Task,
-
-Hold.prototype = {
-    __proto__: Task.prototype,
 
     _init: function() {
-        Task.prototype._init.call(this,
+        this.parent(this, function () {
-                                  this,
+            return this;
-                                  function () {
+        });
-                                      return this;
-                                  });
 
         this._acquisitions = 1;
     },
@@ -88,18 +81,15 @@ Hold.prototype = {
     isAcquired: function() {
         return this._acquisitions > 0;
     }
-}
+});
 Signals.addSignalMethods(Hold.prototype);
 
-function Batch() {
+const Batch = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'Batch',
-}
+    Extends: Task,
-
-Batch.prototype = {
-    __proto__: Task.prototype,
 
     _init: function(scope, tasks) {
-        Task.prototype._init.call(this);
+        this.parent();
 
         this.tasks = [];
 
@@ -166,20 +156,12 @@ Batch.prototype = {
     cancel: function() {
         this.tasks = this.tasks.splice(0, this._currentTaskIndex + 1);
     }
-
+});
-};
 Signals.addSignalMethods(Batch.prototype);
 
-function ConcurrentBatch() {
+const ConcurrentBatch = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'ConcurrentBatch',
-}
+    Extends: Batch,
-
-ConcurrentBatch.prototype = {
-    __proto__: Batch.prototype,
-
-    _init: function(scope, tasks) {
-        Batch.prototype._init.call(this, scope, tasks);
-    },
 
     process: function() {
        let hold = this.runTask();
@@ -193,19 +175,12 @@ ConcurrentBatch.prototype = {
        // concurrently.
        this.nextTask();
     }
-};
+});
 Signals.addSignalMethods(ConcurrentBatch.prototype);
 
-function ConsecutiveBatch() {
+const ConsecutiveBatch = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'ConsecutiveBatch',
-}
+    Extends: Batch,
-
-ConsecutiveBatch.prototype = {
-    __proto__: Batch.prototype,
-
-    _init: function(scope, tasks) {
-        Batch.prototype._init.call(this, scope, tasks);
-    },
 
     process: function() {
        let hold = this.runTask();
@@ -224,5 +199,5 @@ ConsecutiveBatch.prototype = {
            this.nextTask();
        }
     }
-};
+});
 Signals.addSignalMethods(ConsecutiveBatch.prototype);

js/gdm/consoleKit.js

@@ -1,32 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const DBus = imports.dbus;
-
-const ConsoleKitManagerIface = {
-    name: 'org.freedesktop.ConsoleKit.Manager',
-    methods: [{ name: 'CanRestart',
-                inSignature: '',
-                outSignature: 'b' },
-              { name: 'CanStop',
-                inSignature: '',
-                outSignature: 'b' },
-              { name: 'Restart',
-                inSignature: '',
-                outSignature: '' },
-              { name: 'Stop',
-                inSignature: '',
-                outSignature: '' }]
-};
-
-function ConsoleKitManager() {
-    this._init();
-};
-
-ConsoleKitManager.prototype = {
-    _init: function() {
-        DBus.system.proxifyObject(this,
-                                  'org.freedesktop.ConsoleKit',
-                                  '/org/freedesktop/ConsoleKit/Manager');
-    }
-};
-DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);

js/gdm/fingerprint.js

@@ -1,26 +1,26 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const DBus = imports.dbus;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = {
+const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
-    name: 'net.reactivated.Fprint.Manager',
+<method name='GetDefaultDevice'>
-    methods: [{ name: 'GetDefaultDevice',
+    <arg type='o' direction='out' />
-                inSignature: '',
+</method>
-                outSignature: 'o' }]
+</interface>;
-};
+
+const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 
 function FprintManager() {
-    this._init();
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-};
+                                   g_interface_name: FprintManagerInfo.name,
+                                   g_interface_info: FprintManagerInfo,
+                                   g_name: 'net.reactivated.Fprint',
+                                   g_object_path: '/net/reactivated/Fprint/Manager',
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
 
-FprintManager.prototype = {
+    self.init(null);
-    _init: function() {
+    return self;
-        DBus.system.proxifyObject(this,
+}
-                                  'net.reactivated.Fprint',
-                                  '/net/reactivated/Fprint/Manager');
-    }
-};
-DBus.proxifyPrototype(FprintManager.prototype, FprintManagerIface);

js/gdm/powerMenu.js

@@ -18,31 +18,31 @@
  * 02111-1307, USA.
  */
 
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const UPowerGlib = imports.gi.UPowerGlib;
 
-const ConsoleKit = imports.gdm.consoleKit;
+const LoginManager = imports.misc.loginManager;
+
+const GdmUtil = imports.gdm.util;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
-function PowerMenuButton() {
+const PowerMenuButton = new Lang.Class({
-    this._init();
+    Name: 'PowerMenuButton',
-}
+    Extends: PanelMenu.SystemStatusButton,
-
-PowerMenuButton.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
 
     _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'system-shutdown', null);
+        /* Translators: accessible name of the power menu in the login screen */
-        this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
+        this.parent('system-shutdown-symbolic', _("Power"));
-        this._upClient = new UPowerGlib.Client();
+
+        this._loginManager = LoginManager.getLoginManager();
+
+        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
+        this._settings.connect('changed::disable-restart-buttons',
+                               Lang.bind(this, this._updateVisibility));
 
         this._createSubMenu();
 
-        this._upClient.connect('notify::can-suspend',
-                               Lang.bind(this, this._updateHaveSuspend));
-        this._updateHaveSuspend();
-
         // ConsoleKit doesn't send notifications when shutdown/reboot
         // are disabled, so we update the menu item each time the menu opens
         this.menu.connect('open-state-changed', Lang.bind(this,
@@ -50,64 +50,41 @@ PowerMenuButton.prototype = {
                 if (open) {
                     this._updateHaveShutdown();
                     this._updateHaveRestart();
+                    this._updateHaveSuspend();
                 }
             }));
         this._updateHaveShutdown();
         this._updateHaveRestart();
+        this._updateHaveSuspend();
     },
 
     _updateVisibility: function() {
-        if (!this._haveSuspend && !this._haveShutdown && !this._haveRestart)
+        let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
-            this.actor.hide();
+        this.actor.visible = shouldBeVisible && !this._settings.get_boolean('disable-restart-buttons');
-        else
-            this.actor.show();
     },
 
     _updateHaveShutdown: function() {
-        this._consoleKitManager.CanStopRemote(Lang.bind(this,
+        this._loginManager.canPowerOff(Lang.bind(this, function(result) {
-            function(result, error) {
+            this._haveShutdown = result;
-                if (!error)
+            this._powerOffItem.actor.visible = this._haveShutdown;
-                    this._haveShutdown = result;
+            this._updateVisibility();
-                else
+        }));
-                    this._haveShutdown = false;
-
-                if (this._haveShutdown) {
-                    this._powerOffItem.actor.show();
-                } else {
-                    this._powerOffItem.actor.hide();
-                }
-
-                this._updateVisibility();
-            }));
     },
 
     _updateHaveRestart: function() {
-        this._consoleKitManager.CanRestartRemote(Lang.bind(this,
+        this._loginManager.canReboot(Lang.bind(this, function(result) {
-            function(result, error) {
+            this._haveRestart = result;
-                if (!error)
+            this._restartItem.actor.visible = this._haveRestart;
-                    this._haveRestart = result;
+            this._updateVisibility();
-                else
+        }));
-                    this._haveRestart = false;
-
-                if (this._haveRestart) {
-                    this._restartItem.actor.show();
-                } else {
-                    this._restartItem.actor.hide();
-                }
-
-                this._updateVisibility();
-            }));
     },
 
     _updateHaveSuspend: function() {
-        this._haveSuspend = this._upClient.get_can_suspend();
+        this._loginManager.canSuspend(Lang.bind(this, function(result) {
-
+            this._haveSuspend = result;
-        if (this._haveSuspend)
+            this._suspendItem.actor.visible = this._haveSuspend;
-            this._suspendItem.actor.show();
+            this._updateVisibility();
-        else
+        }));
-            this._suspendItem.actor.hide();
-
-        this._updateVisibility();
     },
 
     _createSubMenu: function() {
@@ -130,17 +107,23 @@ PowerMenuButton.prototype = {
     },
 
     _onActivateSuspend: function() {
-        if (this._haveSuspend)
+        if (!this._haveSuspend)
-            this._upClient.suspend_sync(null);
+            return;
+
+        this._loginManager.suspend();
     },
 
     _onActivateRestart: function() {
-        if (this._haveRestart)
+        if (!this._haveRestart)
-            this._consoleKitManager.RestartRemote();
+            return;
+
+        this._loginManager.reboot();
     },
 
     _onActivatePowerOff: function() {
-        if (this._haveShutdown)
+        if (!this._haveShutdown)
-            this._consoleKitManager.StopRemote();
+            return;
+
+        this._loginManager.powerOff();
     }
-};
+});

js/gdm/realmd.js

@@ -0,0 +1,139 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+
+const ProviderIface = <interface name='org.freedesktop.realmd.Provider'>
+    <property name="Name" type="s" access="read"/>
+    <property name="Version" type="s" access="read"/>
+    <property name="Realms" type="ao" access="read"/>
+    <method name="Discover">
+        <arg name="string" type="s" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+        <arg name="relevance" type="i" direction="out"/>
+        <arg name="realm" type="ao" direction="out"/>
+    </method>
+</interface>;
+const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
+
+const ServiceIface = <interface name="org.freedesktop.realmd.Service">
+    <method name="Cancel">
+        <arg name="operation" type="s" direction="in"/>
+    </method>
+    <method name="Release" />
+    <method name="SetLocale">
+        <arg name="locale" type="s" direction="in"/>
+    </method>
+    <signal name="Diagnostics">
+        <arg name="data" type="s"/>
+        <arg name="operation" type="s"/>
+    </signal>
+</interface>;
+const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
+
+const RealmIface = <interface name="org.freedesktop.realmd.Realm">
+    <property name="Name" type="s" access="read"/>
+    <property name="Configured" type="s" access="read"/>
+    <property name="Details" type="a(ss)" access="read"/>
+    <property name="LoginFormats" type="as" access="read"/>
+    <property name="LoginPolicy" type="s" access="read"/>
+    <property name="PermittedLogins" type="as" access="read"/>
+    <property name="SupportedInterfaces" type="as" access="read"/>
+    <method name="ChangeLoginPolicy">
+        <arg name="login_policy" type="s" direction="in"/>
+        <arg name="permitted_add" type="as" direction="in"/>
+        <arg name="permitted_remove" type="as" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+    <method name="Deconfigure">
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+</interface>;
+const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
+
+const Manager = new Lang.Class({
+    Name: 'Manager',
+
+    _init: function(parentActor) {
+        this._aggregateProvider = Provider(Gio.DBus.system,
+                                           'org.freedesktop.realmd',
+                                           '/org/freedesktop/realmd',
+                                           Lang.bind(this, this._reloadRealms))
+        this._realms = {};
+
+        this._aggregateProvider.connect('g-properties-changed',
+                                        Lang.bind(this, function(proxy, properties) {
+                                            if ('Realms' in properties.deep_unpack())
+                                                this._reloadRealms();
+                                        }));
+    },
+
+    _reloadRealms: function() {
+        let realmPaths = this._aggregateProvider.Realms;
+
+        if (!realmPaths)
+            return;
+
+        for (let i = 0; i < realmPaths.length; i++) {
+            let realm = Realm(Gio.DBus.system,
+                              'org.freedesktop.realmd',
+                              realmPaths[i],
+                              Lang.bind(this, this._onRealmLoaded));
+        }
+    },
+
+    _reloadRealm: function(realm) {
+        if (!realm.Configured) {
+            if (this._realms[realm.get_object_path()])
+                delete this._realms[realm.get_object_path()];
+
+            return;
+        }
+
+        this._realms[realm.get_object_path()] = realm;
+
+        this._updateLoginFormat();
+    },
+
+    _onRealmLoaded: function(realm, error) {
+        if (error)
+            return;
+
+        this._reloadRealm(realm);
+
+        realm.connect('g-properties-changed',
+                      Lang.bind(this, function(proxy, properties) {
+                                if ('Configured' in properties.deep_unpack())
+                                    this._reloadRealm();
+                                }));
+    },
+
+    _updateLoginFormat: function() {
+        let newLoginFormat;
+
+        for (let realmPath in this._realms) {
+            let realm = this._realms[realmPath];
+            if (realm.LoginFormats && realm.LoginFormats.length > 0) {
+                newLoginFormat = realm.LoginFormats[0];
+                break;
+            }
+        }
+
+        if (this._loginFormat != newLoginFormat) {
+            this._loginFormat = newLoginFormat;
+            this.emit('login-format-changed', newLoginFormat);
+        }
+    },
+
+    get loginFormat() {
+        if (this._loginFormat !== undefined)
+            return this._loginFormat;
+
+        this._updateLoginFormat();
+
+        return this._loginFormat;
+    }
+});
+Signals.addSignalMethods(Manager.prototype)

js/gdm/util.js

@@ -0,0 +1,372 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Signals = imports.signals;
+
+const Batch = imports.gdm.batch;
+const Fprint = imports.gdm.fingerprint;
+const Realmd = imports.gdm.realmd;
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
+
+const PASSWORD_SERVICE_NAME = 'gdm-password';
+const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
+const FADE_ANIMATION_TIME = 0.16;
+
+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)
+        return null;
+
+    let hold = new Batch.Hold();
+    actor.show();
+    let [minHeight, naturalHeight] = actor.get_preferred_height(-1);
+
+    actor.opacity = 0;
+    actor.set_height(0);
+    Tweener.addTween(actor,
+                     { opacity: 255,
+                       height: naturalHeight,
+                       time: FADE_ANIMATION_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: function() {
+                           this.set_height(-1);
+                           hold.release();
+                       },
+                     });
+
+    return hold;
+}
+
+function fadeOutActor(actor) {
+    if (!actor.visible || actor.opacity == 0) {
+        actor.opacity = 0;
+        actor.hide();
+        return null;
+    }
+
+    let hold = new Batch.Hold();
+    Tweener.addTween(actor,
+                     { opacity: 0,
+                       height: 0,
+                       time: FADE_ANIMATION_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: function() {
+                           this.hide();
+                           this.set_height(-1);
+                           hold.release();
+                       },
+                     });
+    return hold;
+}
+
+const ShellUserVerifier = new Lang.Class({
+    Name: 'ShellUserVerifier',
+
+    _init: function(client, params) {
+        params = Params.parse(params, { reauthenticationOnly: false });
+        this._reauthOnly = params.reauthenticationOnly;
+
+        this._client = client;
+
+        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
+
+        this._fprintManager = new Fprint.FprintManager();
+        this._realmManager = new Realmd.Manager();
+
+        this._failCounter = 0;
+    },
+
+    begin: function(userName, hold) {
+        this._cancellable = new Gio.Cancellable();
+        this._hold = hold;
+        this._userName = userName;
+
+        this._checkForFingerprintReader();
+
+        if (userName) {
+            // If possible, reauthenticate an already running session,
+            // so any session specific credentials get updated appropriately
+            this._client.open_reauthentication_channel(userName, this._cancellable,
+                                                       Lang.bind(this, this._reauthenticationChannelOpened));
+        } else {
+            this._client.get_user_verifier(this._cancellable, Lang.bind(this, this._userVerifierGot));
+        }
+    },
+
+    cancel: function() {
+        if (this._cancellable)
+            this._cancellable.cancel();
+
+        if (this._userVerifier)
+            this._userVerifier.call_cancel_sync(null);
+    },
+
+    clear: function() {
+        if (this._cancellable) {
+            this._cancellable.cancel();
+            this._cancellable = null;
+        }
+
+        if (this._userVerifier) {
+            this._userVerifier.run_dispose();
+            this._userVerifier = null;
+        }
+    },
+
+    answerQuery: function(serviceName, answer) {
+        // Clear any previous message
+        this.emit('show-message', null, null);
+
+        this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+    },
+
+    _checkForFingerprintReader: function() {
+        this._haveFingerprintReader = false;
+
+        if (!this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY))
+            return;
+
+        this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, this._cancellable, Lang.bind(this,
+            function(device, error) {
+                if (!error && device)
+                    this._haveFingerprintReader = true;
+            }));
+    },
+
+    _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);
+        } 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.IOErrorEnum.CANCELLED)) {
+            return;
+        } catch(e) {
+            this._reportInitError('Failed to obtain user verifier', e);
+            return;
+        }
+
+        this._connectSignals();
+        this._beginVerification();
+        this._hold.release();
+    },
+
+    _connectSignals: function() {
+        this._userVerifier.connect('info', Lang.bind(this, this._onInfo));
+        this._userVerifier.connect('problem', Lang.bind(this, this._onProblem));
+        this._userVerifier.connect('info-query', Lang.bind(this, this._onInfoQuery));
+        this._userVerifier.connect('secret-info-query', Lang.bind(this, this._onSecretInfoQuery));
+        this._userVerifier.connect('conversation-stopped', Lang.bind(this, this._onConversationStopped));
+        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
+    },
+
+    _beginVerification: function() {
+        this._hold.acquire();
+
+        if (this._userName) {
+            this._userVerifier.call_begin_verification_for_user(PASSWORD_SERVICE_NAME,
+                                                                this._userName,
+                                                                this._cancellable,
+                                                                Lang.bind(this, function(obj, result) {
+                try {
+                    obj.call_begin_verification_for_user_finish(result);
+                } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                    return;
+                } catch(e) {
+                    this._reportInitError('Failed to start verification for user', e);
+                    return;
+                }
+
+                this._hold.release();
+            }));
+
+            if (this._haveFingerprintReader) {
+                this._hold.acquire();
+
+                this._userVerifier.call_begin_verification_for_user(FINGERPRINT_SERVICE_NAME,
+                                                                    this._userName,
+                                                                    this._cancellable,
+                                                                    Lang.bind(this, function(obj, result) {
+                    try {
+                        obj.call_begin_verification_for_user_finish(result);
+                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                        return;
+                    } catch(e) {
+                        this._reportInitError('Failed to start fingerprint verification for user', e);
+                        return;
+                    }
+
+                    this._hold.release();
+                }));
+            }
+        } else {
+            this._userVerifier.call_begin_verification(PASSWORD_SERVICE_NAME,
+                                                       this._cancellable,
+                                                       Lang.bind(this, function(obj, result) {
+                try {
+                    obj.call_begin_verification_finish(result);
+                } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
+                    return;
+                } catch(e) {
+                    this._reportInitError('Failed to start verification', e);
+                    return;
+                }
+
+                this._hold.release();
+            }));
+        }
+    },
+
+    _onInfo: function(client, serviceName, info) {
+        // We don't display fingerprint messages, because they
+        // have words like UPEK in them. Instead we use the messages
+        // as a cue to display our own message.
+        if (serviceName == FINGERPRINT_SERVICE_NAME &&
+            this._haveFingerprintReader) {
+
+            // Translators: this message is shown below the password entry field
+            // to indicate the user can swipe their finger instead
+            this.emit('show-login-hint', _("(or swipe finger)"));
+        } else if (serviceName == PASSWORD_SERVICE_NAME) {
+            this.emit('show-message', info, 'login-dialog-message-info');
+        }
+    },
+
+    _onProblem: function(client, serviceName, problem) {
+        // we don't want to show auth failed messages to
+        // users who haven't enrolled their fingerprint.
+        if (serviceName != PASSWORD_SERVICE_NAME)
+            return;
+        this.emit('show-message', problem, 'login-dialog-message-warning');
+    },
+
+    _showRealmLoginHint: function() {
+        if (this._realmManager.loginFormat) {
+            let hint = this._realmManager.loginFormat;
+
+            hint = hint.replace(/%U/g, 'user');
+            hint = hint.replace(/%D/g, 'DOMAIN');
+            hint = hint.replace(/%[^UD]/g, '');
+
+            // Translators: this message is shown below the username entry field
+            // to clue the user in on how to login to the local network realm
+            this.emit('show-login-hint',
+                      _("(e.g., user or %s)").format(hint));
+        }
+    },
+
+    _onInfoQuery: function(client, serviceName, question) {
+        // We only expect questions to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
+            return;
+
+        this._showRealmLoginHint();
+        this._realmLoginHintSignalId = this._realmManager.connect('login-format-changed',
+                                                                  Lang.bind(this, this._showRealmLoginHint));
+
+        this.emit('ask-question', serviceName, question, '');
+    },
+
+    _onSecretInfoQuery: function(client, serviceName, secretQuestion) {
+        // We only expect secret requests to come from the main auth service
+        if (serviceName != PASSWORD_SERVICE_NAME)
+            return;
+
+        this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
+    },
+
+    _onReset: function() {
+        this.clear();
+
+        // Clear previous attempts to authenticate
+        this._failCounter = 0;
+
+        this.emit('reset');
+    },
+
+    _onVerificationComplete: function() {
+        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._verificationFailed(true);
+        }
+
+        this.emit('hide-login-hint');
+
+        if (this._realmLoginHintSignalId) {
+            this._realmManager.disconnect(this._realmLoginHintSignalId);
+            this._realmLoginHintSignalId = 0;
+        }
+    },
+});
+Signals.addSignalMethods(ShellUserVerifier.prototype);

js/misc/config.js.in

@@ -4,9 +4,12 @@
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
-/* The version of GJS we're linking to */
-const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* The system TLS CA list */
+/* gettext package */
-const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
+const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+/* locale dir */
+const LOCALEDIR = '@datadir@/locale';
+/* other standard directories */
+const LIBEXECDIR = '@libexecdir@';
+const SYSCONFDIR = '@sysconfdir@';

js/misc/docInfo.js

@@ -1,140 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Search = imports.ui.search;
-
-const THUMBNAIL_ICON_MARGIN = 2;
-
-function DocInfo(recentInfo) {
-    this._init(recentInfo);
-}
-
-DocInfo.prototype = {
-    _init : function(recentInfo) {
-        this.recentInfo = recentInfo;
-        // We actually used get_modified() instead of get_visited()
-        // here, as GtkRecentInfo doesn't updated get_visited()
-        // correctly. See http://bugzilla.gnome.org/show_bug.cgi?id=567094
-        this.timestamp = recentInfo.get_modified();
-        this.name = recentInfo.get_display_name();
-        this._lowerName = this.name.toLowerCase();
-        this.uri = recentInfo.get_uri();
-        this.mimeType = recentInfo.get_mime_type();
-    },
-
-    createIcon : function(size) {
-        return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
-    },
-
-    launch : function(workspaceIndex) {
-        Shell.DocSystem.get_default().open(this.recentInfo, workspaceIndex);
-    },
-
-    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;
-    }
-};
-
-var docManagerInstance = null;
-
-function getDocManager() {
-    if (docManagerInstance == null)
-        docManagerInstance = new DocManager();
-    return docManagerInstance;
-}
-
-/**
- * DocManager wraps the DocSystem, primarily to expose DocInfo objects.
- */
-function DocManager() {
-    this._init();
-}
-
-DocManager.prototype = {
-    _init: function() {
-        this._docSystem = Shell.DocSystem.get_default();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
-        this._docSystem.connect('changed', Lang.bind(this, this._reload));
-        this._reload();
-    },
-
-    _reload: function() {
-        let docs = this._docSystem.get_all();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
-        for (let i = 0; i < docs.length; i++) {
-            let recentInfo = docs[i];
-
-            let docInfo = new DocInfo(recentInfo);
-            this._infosByTimestamp.push(docInfo);
-            this._infosByUri[docInfo.uri] = docInfo;
-        }
-        this.emit('changed');
-    },
-
-    getTimestampOrderedInfos: function() {
-        return this._infosByTimestamp;
-    },
-
-    getInfosByUri: function() {
-        return this._infosByUri;
-    },
-
-    lookupByUri: function(uri) {
-        return this._infosByUri[uri];
-    },
-
-    queueExistenceCheck: function(count) {
-        return this._docSystem.queue_existence_check(count);
-    },
-
-    _searchDocs: function(items, terms) {
-        let multiplePrefixMatches = [];
-        let prefixMatches = [];
-        let multipleSubtringMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < items.length; i++) {
-            let item = items[i];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
-                multiplePrefixMatches.push(item.uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(item.uri);
-            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
-                multipleSubtringMatches.push(item.uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(item.uri);
-         }
-        return multiplePrefixMatches.concat(prefixMatches.concat(multipleSubtringMatches.concat(substringMatches)));
-    },
-
-    initialSearch: function(terms) {
-        return this._searchDocs(this._infosByTimestamp, terms);
-    },
-
-    subsearch: function(previousResults, terms) {
-        return this._searchDocs(previousResults.map(Lang.bind(this,
-            function(url) {
-                return this._infosByUri[url];
-            })), terms);
-    }
-};
-
-Signals.addSignalMethods(DocManager.prototype);

js/misc/extensionUtils.js

@@ -0,0 +1,185 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+// Common utils for the extension system and the extension
+// preferences tool
+
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const ShellJS = imports.gi.ShellJS;
+
+const Config = imports.misc.config;
+const FileUtils = imports.misc.fileUtils;
+
+const ExtensionType = {
+    SYSTEM: 1,
+    PER_USER: 2
+};
+
+// Maps uuid -> metadata object
+const extensions = {};
+
+function getCurrentExtension() {
+    let stack = (new Error()).stack;
+
+    // Assuming we're importing this directly from an extension (and we shouldn't
+    // ever not be), its UUID should be directly in the path here.
+    let extensionStackLine = stack.split('\n')[1];
+    if (!extensionStackLine)
+        throw new Error('Could not find current extension');
+
+    // The stack line is like:
+    //   init([object Object])@/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
+    //
+    // In the case that we're importing from
+    // module scope, the first field is blank:
+    //   @/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
+    let match = new RegExp('@(.+):\\d+').exec(extensionStackLine);
+    if (!match)
+        throw new Error('Could not find current extension');
+
+    let path = match[1];
+    let file = Gio.File.new_for_path(path);
+
+    // Walk up the directory tree, looking for an extesion with
+    // the same UUID as a directory name.
+    while (file != null) {
+        let extension = extensions[file.get_basename()];
+        if (extension !== undefined)
+            return extension;
+        file = file.get_parent();
+    }
+
+    throw new Error('Could not find current extension');
+}
+
+/**
+ * versionCheck:
+ * @required: an array of versions we're compatible with
+ * @current: the version we have
+ *
+ * Check if a component is compatible for an extension.
+ * @required is an array, and at least one version must match.
+ * @current must be in the format <major>.<minor>.<point>.<micro>
+ * <micro> is always ignored
+ * <point> is ignored if <minor> is even (so you can target the
+ * whole stable release)
+ * <minor> and <major> must match
+ * Each target version must be at least <major> and <minor>
+ */
+function versionCheck(required, current) {
+    let currentArray = current.split('.');
+    let major = currentArray[0];
+    let minor = currentArray[1];
+    let point = currentArray[2];
+    for (let i = 0; i < required.length; i++) {
+        let requiredArray = required[i].split('.');
+        if (requiredArray[0] == major &&
+            requiredArray[1] == minor &&
+            (requiredArray[2] == point ||
+             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
+            return true;
+    }
+    return false;
+}
+
+function isOutOfDate(extension) {
+    if (!versionCheck(extension.metadata['shell-version'], Config.PACKAGE_VERSION))
+        return true;
+
+    return false;
+}
+
+function createExtensionObject(uuid, dir, type) {
+    let info;
+
+    let metadataFile = dir.get_child('metadata.json');
+    if (!metadataFile.query_exists(null)) {
+        throw new Error('Missing metadata.json');
+    }
+
+    let metadataContents, success, tag;
+    try {
+        [success, metadataContents, tag] = metadataFile.load_contents(null);
+    } catch (e) {
+        throw new Error('Failed to load metadata.json: ' + e);
+    }
+    let meta;
+    try {
+        meta = JSON.parse(metadataContents);
+    } catch (e) {
+        throw new Error('Failed to parse metadata.json: ' + e);
+    }
+
+    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
+    for (let i = 0; i < requiredProperties.length; i++) {
+        let prop = requiredProperties[i];
+        if (!meta[prop]) {
+            throw new Error('missing "' + prop + '" property in metadata.json');
+        }
+    }
+
+    if (uuid != meta.uuid) {
+        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
+    }
+
+    let extension = {};
+
+    extension.metadata = meta;
+    extension.uuid = meta.uuid;
+    extension.type = type;
+    extension.dir = dir;
+    extension.path = dir.get_path();
+    extension.error = '';
+    extension.hasPrefs = dir.get_child('prefs.js').query_exists(null);
+
+    extensions[uuid] = extension;
+
+    return extension;
+}
+
+var _extension = null;
+
+function installImporter(extension) {
+    _extension = extension;
+    ShellJS.add_extension_importer('imports.misc.extensionUtils._extension', 'imports', extension.path);
+    _extension = null;
+}
+
+const ExtensionFinder = new Lang.Class({
+    Name: 'ExtensionFinder',
+
+    _loadExtension: function(extensionDir, info, perUserDir) {
+        let fileType = info.get_file_type();
+        if (fileType != Gio.FileType.DIRECTORY)
+            return;
+        let uuid = info.get_name();
+        let existing = extensions[uuid];
+        if (existing) {
+            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
+            return;
+        }
+
+        let extension;
+        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
+                                                       : ExtensionType.SYSTEM;
+        try {
+            extension = createExtensionObject(uuid, extensionDir, type);
+        } catch(e) {
+            logError(e, 'Could not load extension %s'.format(uuid));
+            return;
+        }
+        this.emit('extension-found', extension);
+    },
+
+    scanExtensions: function() {
+        let perUserDir = Gio.File.new_for_path(global.userdatadir);
+        FileUtils.collectFromDatadirsAsync('extensions',
+                                           { processFile: Lang.bind(this, this._loadExtension),
+                                             includeUserDir: true,
+                                             data: perUserDir });
+    }
+});
+Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -2,10 +2,12 @@
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Params = imports.misc.params;
 
 function listDirAsync(file, callback) {
     let allFiles = [];
-    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
+    file.enumerate_children_async('standard::name,standard::type',
                                   Gio.FileQueryInfoFlags.NONE,
                                   GLib.PRIORITY_LOW, null, function (obj, res) {
         let enumerator = obj.enumerate_children_finish(res);
@@ -23,12 +25,69 @@ function listDirAsync(file, callback) {
     });
 }
 
+function _collectFromDirectoryAsync(dir, loadState) {
+    function done() {
+        loadState.numLoading--;
+        if (loadState.loadedCallback &&
+            loadState.numLoading == 0)
+            loadState.loadedCallback(loadState.data);
+    }
+
+    dir.query_info_async('standard::type', Gio.FileQueryInfoFlags.NONE,
+        GLib.PRIORITY_DEFAULT, null, function(object, res) {
+            try {
+                object.query_info_finish(res);
+            } catch (e) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                    log(e.message);
+                done();
+                return;
+            }
+
+            listDirAsync(dir, Lang.bind(this, function(infos) {
+                for (let i = 0; i < infos.length; i++)
+                    loadState.processFile(dir.get_child(infos[i].get_name()),
+                                          infos[i], loadState.data);
+                done();
+            }));
+        });
+}
+
+function collectFromDatadirsAsync(subdir, params) {
+    params = Params.parse(params, { includeUserDir: false,
+                                    processFile: null,
+                                    loadedCallback: null,
+                                    data: null });
+    let loadState = { data: params.data,
+                      numLoading: 0,
+                      loadedCallback: params.loadedCallback,
+                      processFile: params.processFile };
+
+    if (params.processFile == null) {
+        if (params.loadedCallback)
+            params.loadedCallback(params.data);
+        return;
+    }
+
+    let dataDirs = GLib.get_system_data_dirs();
+    if (params.includeUserDir)
+        dataDirs.unshift(GLib.get_user_data_dir());
+    loadState.numLoading = dataDirs.length;
+
+    for (let i = 0; i < dataDirs.length; i++) {
+        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
+        let dir = Gio.File.new_for_path(path);
+
+        _collectFromDirectoryAsync(dir, loadState);
+    }
+}
+
 function deleteGFile(file) {
     // Work around 'delete' being a keyword in JS.
     return file['delete'](null);
 }
 
-function recursivelyDeleteDir(dir) {
+function recursivelyDeleteDir(dir, deleteParent) {
     let children = dir.enumerate_children('standard::name,standard::type',
                                           Gio.FileQueryInfoFlags.NONE, null);
 
@@ -38,9 +97,30 @@ function recursivelyDeleteDir(dir) {
         let child = dir.get_child(info.get_name());
         if (type == Gio.FileType.REGULAR)
             deleteGFile(child);
-        else if (type == Gio.TypeType.DIRECTORY)
+        else if (type == Gio.FileType.DIRECTORY)
-            recursivelyDeleteDir(child);
+            recursivelyDeleteDir(child, true);
     }
 
-    deleteGFile(dir);
+    if (deleteParent)
+        deleteGFile(dir);
+}
+
+function recursivelyMoveDir(srcDir, destDir) {
+    let children = srcDir.enumerate_children('standard::name,standard::type',
+                                             Gio.FileQueryInfoFlags.NONE, null);
+
+    if (!destDir.query_exists(null))
+        destDir.make_directory_with_parents(null);
+
+    let info, child;
+    while ((info = children.next_file(null)) != null) {
+        let type = info.get_file_type();
+        let srcChild = srcDir.get_child(info.get_name());
+        let destChild = destDir.get_child(info.get_name());
+        log([srcChild.get_path(), destChild.get_path()]);
+        if (type == Gio.FileType.REGULAR)
+            srcChild.move(destChild, Gio.FileCopyFlags.NONE, null, null);
+        else if (type == Gio.FileType.DIRECTORY)
+            recursivelyMoveDir(srcChild, destChild);
+    }
 }

js/misc/format.js

@@ -1,60 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-/*
- * This function is intended to extend the String object and provide
- * an String.format API for string formatting.
- * It has to be set up using String.prototype.format = Format.format;
- * Usage:
- * "somestring %s %d".format('hello', 5);
- * It supports %s, %d, %x and %f, for %f it also support precisions like
- * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
- * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
- * with '0', the formatted string will be padded with spaces.
- */
-
-function format() {
-    let str = this;
-    let i = 0;
-    let args = arguments;
-
-    return str.replace(/%([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, widthGroup, precisionGroup, genericGroup) {
-
-                    if (precisionGroup != '' && genericGroup != 'f')
-                        throw new Error("Precision can only be specified for 'f'");
-
-                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
-                    let width = parseInt(widthGroup, 10) || 0;
-
-                    function fillWidth(s, c, w) {
-                        let fill = '';
-                        for (let i = 0; i < w; i++)
-                            fill += c;
-                        return fill.substr(s.length) + s;
-                    }
-
-                    let s = '';
-                    switch (genericGroup) {
-                        case '%':
-                            return '%';
-                            break;
-                        case 's':
-                            s = args[i++].toString();
-                            break;
-                        case 'd':
-                            s = parseInt(args[i++]).toString();
-                            break;
-                        case 'x':
-                            s = parseInt(args[i++]).toString(16);
-                            break;
-                        case 'f':
-                            if (precisionGroup == '')
-                                s = parseFloat(args[i++]).toString();
-                            else
-                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
-                            break;
-                        default:
-                            throw new Error('Unsupported conversion character %' + genericGroup);
-                    }
-                    return fillWidth(s, fillChar, width);
-                });
-}

js/misc/gnomeSession.js

@@ -31,12 +31,12 @@ function Presence(initCallback, cancellable) {
 // change at runtime (changes always come in the form
 // of new inhibitors)
 const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
-<property name="app_id" type="s" access="read" />
+<method name="GetAppId">
-<property name="client_id" type="s" access="read" />
+    <arg type="s" direction="out" />
-<property name="reason" type="s" access="read" />
+</method>
-<property name="flags" type="u" access="read" />
+<method name="GetReason">
-<property name="toplevel_xid" type="u" access="read" />
+    <arg type="s" direction="out" />
-<property name="cookie" type="u" access="read" />
+</method>
 </interface>;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
@@ -50,9 +50,20 @@ const SessionManagerIface = <interface name="org.gnome.SessionManager">
     <arg type="u" direction="in" />
 </method>
 <method name="Shutdown" />
+<method name="Reboot" />
 <method name="CanShutdown">
     <arg type="b" direction="out" />
 </method>
+<method name="IsInhibited">
+    <arg type="u" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<signal name="InhibitorAdded">
+    <arg type="o" direction="out"/>
+</signal>
+<signal name="InhibitorRemoved">
+    <arg type="o" direction="out"/>
+</signal>
 </interface>;
 
 var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);

js/misc/history.js

@@ -7,11 +7,9 @@ const Params = imports.misc.params;
 
 const DEFAULT_LIMIT = 512;
 
-function HistoryManager(params) {
+const HistoryManager = new Lang.Class({
-    this._init(params);
+    Name: 'HistoryManager',
-}
 
-HistoryManager.prototype = {
     _init: function(params) {
         params = Params.parse(params, { gsettingsKey: null,
                                         limit: DEFAULT_LIMIT,
@@ -43,24 +41,26 @@ HistoryManager.prototype = {
         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() {
@@ -85,11 +85,9 @@ HistoryManager.prototype = {
     _onEntryKeyPress: function(entry, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Up) {
-            this.prevItem(entry.get_text());
+            return this._setPrevItem(entry.get_text());
-            return true;
         } else if (symbol == Clutter.KEY_Down) {
-            this.nextItem(entry.get_text());
+            return this._setNextItem(entry.get_text());
-            return true;
         }
         return false;
     },
@@ -100,8 +98,6 @@ HistoryManager.prototype = {
 
         if (this._entry)
             this._entry.set_text(current);
-
-        return current;
     },
 
     _save: function() {
@@ -111,5 +107,5 @@ HistoryManager.prototype = {
         if (this._key)
             global.settings.set_strv(this._key, this._history);
     }
-};
+});
 Signals.addSignalMethods(HistoryManager.prototype);

js/misc/loginManager.js

@@ -0,0 +1,229 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const UPowerGlib = imports.gi.UPowerGlib;
+
+const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
+<method name='PowerOff'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='Reboot'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='Suspend'>
+    <arg type='b' direction='in'/>
+</method>
+<method name='CanPowerOff'>
+    <arg type='s' direction='out'/>
+</method>
+<method name='CanReboot'>
+    <arg type='s' direction='out'/>
+</method>
+<method name='CanSuspend'>
+    <arg type='s' direction='out'/>
+</method>
+</interface>;
+
+const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
+<signal name='Lock' />
+<signal name='Unlock' />
+</interface>;
+
+const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
+const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
+
+const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manager'>
+<method name='CanRestart'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='CanStop'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='Restart' />
+<method name='Stop' />
+<method name='GetCurrentSession'>
+    <arg type='o' direction='out' />
+</method>
+</interface>;
+
+const ConsoleKitSessionIface = <interface name='org.freedesktop.ConsoleKit.Session'>
+<method name='IsActive'>
+    <arg type='b' direction='out' />
+</method>
+<signal name='ActiveChanged'>
+    <arg type='b' direction='out' />
+</signal>
+<signal name='Lock' />
+<signal name='Unlock' />
+</interface>;
+
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
+
+function haveSystemd() {
+    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
+}
+
+let _loginManager = null;
+
+/**
+ * LoginManager:
+ * An abstraction over systemd/logind and ConsoleKit.
+ *
+ */
+function getLoginManager() {
+    if (_loginManager == null) {
+        if (haveSystemd())
+            _loginManager = new LoginManagerSystemd();
+        else
+            _loginManager = new LoginManagerConsoleKit();
+    }
+
+    return _loginManager;
+}
+
+const LoginManagerSystemd = new Lang.Class({
+    Name: 'LoginManagerSystemd',
+
+    _init: function() {
+        this._proxy = new SystemdLoginManager(Gio.DBus.system,
+                                              'org.freedesktop.login1',
+                                              '/org/freedesktop/login1');
+    },
+
+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
+    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            this._currentSession = new SystemdLoginSession(Gio.DBus.system,
+                                                           'org.freedesktop.login1',
+                                                           '/org/freedesktop/login1/session/' +
+                                                           GLib.getenv('XDG_SESSION_ID'));
+        }
+
+        return this._currentSession;
+    },
+
+    get sessionActive() {
+        return Shell.session_is_active_for_systemd();
+    },
+
+    canPowerOff: function(asyncCallback) {
+        this._proxy.CanPowerOffRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
+    canReboot: function(asyncCallback) {
+        this._proxy.CanRebootRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
+    canSuspend: function(asyncCallback) {
+        this._proxy.CanSuspendRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
+        });
+    },
+
+    powerOff: function() {
+        this._proxy.PowerOffRemote(true);
+    },
+
+    reboot: function() {
+        this._proxy.RebootRemote(true);
+    },
+
+    suspend: function() {
+        this._proxy.SuspendRemote(true);
+    }
+});
+
+const LoginManagerConsoleKit = new Lang.Class({
+    Name: 'LoginManagerConsoleKit',
+
+    _init: function() {
+        this._proxy = new ConsoleKitManager(Gio.DBus.system,
+                                            'org.freedesktop.ConsoleKit',
+                                            '/org/freedesktop/ConsoleKit/Manager');
+        this._upClient = new UPowerGlib.Client();
+    },
+
+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
+    // session objects have different interfaces - but in both cases there are
+    // Lock/Unlock signals, and that's all we count upon at the moment.
+    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            let [currentSessionId] = this._proxy.GetCurrentSessionSync();
+            this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                         'org.freedesktop.ConsoleKit',
+                                                         currentSessionId);
+        }
+
+        return this._currentSession;
+    },
+
+    get sessionActive() {
+        if (this._sessionActive !== undefined)
+            return this._sessionActive;
+
+        let session = this.getCurrentSessionProxy();
+        session.connectSignal('ActiveChanged', Lang.bind(this, function(object, senderName, [isActive]) {
+            this._sessionActive = isActive;
+        }));
+        [this._sessionActive] = session.IsActiveSync();
+
+        return this._sessionActive;
+    },
+
+    canPowerOff: function(asyncCallback) {
+        this._proxy.CanStopRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
+        });
+    },
+
+    canReboot: function(asyncCallback) {
+        this._proxy.CanRestartRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
+        });
+    },
+
+    canSuspend: function(asyncCallback) {
+        Mainloop.idle_add(Lang.bind(this, function() {
+            asyncCallback(this._upClient.get_can_suspend());
+            return false;
+        }));
+    },
+
+    powerOff: function() {
+        this._proxy.StopRemote();
+    },
+
+    reboot: function() {
+        this._proxy.RestartRemote();
+    },
+
+    suspend: function() {
+        this._upClient.suspend_sync(null);
+    }
+});

js/misc/modemManager.js

@@ -10,9 +10,7 @@ const Signals = imports.signals;
 
 const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
 <method name="GetRegistrationInfo">
-    <arg type="u" direction="out" />
+    <arg type="(uss)" direction="out" />
-    <arg type="s" direction="out" />
-    <arg type="s" direction="out" />
 </method>
 <method name="GetSignalQuality">
     <arg type="u" direction="out" />
@@ -35,9 +33,7 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C
     <arg type="u" direction="out" />
 </method>
 <method name="GetServingSystem">
-    <arg type="u" direction="out" />
+    <arg type="(usu)" direction="out" />
-    <arg type="s" direction="out" />
-    <arg type="u" direction="out" />
 </method>
 <signal name="SignalQuality">
     <arg type="u" direction="out" />
@@ -50,15 +46,75 @@ let _providersTable;
 function _getProvidersTable() {
     if (_providersTable)
         return _providersTable;
-    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = Shell.mobile_providers_parse(null,null);
-    return _providersTable = providers;
 }
 
-function ModemGsm() {
+function findProviderForMCCMNC(table, needle) {
-    this._init.apply(this, arguments);
+    let needlemcc = needle.substring(0, 3);
+    let needlemnc = needle.substring(3, needle.length);
+
+    let name2, name3;
+    for (let iter in table) {
+        let country = table[iter];
+        let providers = country.get_providers();
+
+        // Search through each country's providers
+        for (let i = 0; i < providers.length; i++) {
+            let provider = providers[i];
+
+            // Search through MCC/MNC list
+            let list = provider.get_gsm_mcc_mnc();
+            for (let j = 0; j < list.length; j++) {
+                let mccmnc = list[j];
+
+                // Match both 2-digit and 3-digit MNC; prefer a
+                // 3-digit match if found, otherwise a 2-digit one.
+                if (mccmnc.mcc != needlemcc)
+                    continue;  // MCC was wrong
+
+                if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                    name3 = provider.name;
+
+                if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                    name2 = provider.name;
+
+                if (name2 && name3)
+                    break;
+            }
+        }
+    }
+
+    return name3 || name2 || null;
 }
 
-ModemGsm.prototype = {
+function findProviderForSid(table, sid) {
+    if (sid == 0)
+        return null;
+
+    // Search through each country
+    for (let iter in table) {
+        let country = table[iter];
+        let providers = country.get_providers();
+
+        // Search through each country's providers
+        for (let i = 0; i < providers.length; i++) {
+            let provider = providers[i];
+            let cdma_sid = provider.get_cdma_sid();
+
+            // Search through CDMA SID list
+            for (let j = 0; j < cdma_sid.length; j++) {
+                if (cdma_sid[j] == sid)
+                    return provider.name;
+            }
+        }
+    }
+
+    return null;
+}
+
+const ModemGsm = new Lang.Class({
+    Name: 'ModemGsm',
+
     _init: function(path) {
         this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
@@ -74,7 +130,7 @@ ModemGsm.prototype = {
             this.operator_name = this._findOperatorName(name, code);
             this.emit('notify::operator-name');
         }));
-        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function(result, err) {
+        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
             if (err) {
                 log(err);
                 return;
@@ -97,79 +153,42 @@ ModemGsm.prototype = {
     },
 
     _findOperatorName: function(name, opCode) {
-        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+        if (name) {
-            // this looks like a valid name, i.e. not an MCCMNC (that some
+            if (name && name.length != 0 && (name.length > 6 || name.length < 5)) {
-            // devices return when not yet connected
+                // this looks like a valid name, i.e. not an MCCMNC (that some
-            return name;
+                // devices return when not yet connected
-        }
+                return name;
-        if (isNaN(parseInt(name))) {
+            }
-            // name is definitely not a MCCMNC, so it may be a name
+            if (isNaN(parseInt(name))) {
-            // after all; return that
+                // name is definitely not a MCCMNC, so it may be a name
-            return name;
+                // after all; return that
+                return name;
+            }
         }
 
         let needle;
-        if (name.length == 0 && opCode)
+        if ((name == null || name.length == 0) && opCode)
             needle = opCode;
         else if (name.length == 6 || name.length == 5)
             needle = name;
         else // nothing to search
             return null;
 
-        return this._findProviderForMCCMNC(needle);
-    },
-
-    _findProviderForMCCMNC: function(needle) {
         let table = _getProvidersTable();
-        let needlemcc = needle.substring(0, 3);
+        return findProviderForMCCMNC(table, needle);
-        let needlemnc = needle.substring(3, needle.length);
-
-        let name2, name3;
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-
-                // Search through MCC/MNC list
-                let list = provider.get_gsm_mcc_mnc();
-                for (let j = 0; j < list.length; j++) {
-                    let mccmnc = list[j];
-
-                    // Match both 2-digit and 3-digit MNC; prefer a
-                    // 3-digit match if found, otherwise a 2-digit one.
-                    if (mccmnc.mcc != needlemcc)
-                        continue;  // MCC was wrong
-
-                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                        name3 = provider.name;
-
-                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                        name2 = provider.name;
-
-                    if (name2 && name3)
-                        break;
-                }
-            }
-        }
-
-        return name3 || name2 || null;
     }
-}
+});
 Signals.addSignalMethods(ModemGsm.prototype);
 
-function ModemCdma() {
+const ModemCdma = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'ModemCdma',
-}
 
-ModemCdma.prototype = {
     _init: function(path) {
         this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
 
         this.signal_quality = 0;
         this.operator_name = null;
-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
+        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
             this.signal_quality = params[0];
             this.emit('notify::signal-quality');
 
@@ -191,45 +210,20 @@ ModemCdma.prototype = {
     },
 
     _refreshServingSystem: function() {
-        this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) {
+        this._proxy.GetServingSystemRemote(Lang.bind(this, function([result], err) {
             if (err) {
                 // it will return an error if the device is not connected
                 this.operator_name = null;
             } else {
                 let [bandClass, band, id] = result;
-                if (name.length > 0)
+                if (name.length > 0) {
-                    this.operator_name = this._findProviderForSid(id);
+                    let table = _getProvidersTable();
-                else
+                    this.operator_name = findProviderForSid(table, id);
+                } else
                     this.operator_name = null;
             }
             this.emit('notify::operator-name');
         }));
-    },
-
-    _findProviderForSid: function(sid) {
-        if (sid == 0)
-            return null;
-
-        let table = _getProvidersTable();
-
-        // Search through each country
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-                let cdma_sid = provider.get_cdma_sid();
-
-                // Search through CDMA SID list
-                for (let j = 0; j < cdma_sid.length; j++) {
-                    if (cdma_sid[j] == sid)
-                        return provider.name;
-                }
-            }
-        }
-
-        return null;
     }
-};
+});
 Signals.addSignalMethods(ModemCdma.prototype);

js/misc/screenSaver.js

@@ -1,48 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-
-const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
-<method name="GetActive">
-    <arg type="b" direction="out" />
-</method>
-<method name="Lock" />
-<method name="SetActive">
-    <arg type="b" direction="in" />
-</method>
-<signal name="ActiveChanged">
-    <arg type="b" direction="out" />
-</signal>
-</interface>;
-
-const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
-
-function ScreenSaverProxy() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-				   g_interface_name: ScreenSaverInfo.name,
-				   g_interface_info: ScreenSaverInfo,
-				   g_name: 'org.gnome.ScreenSaver',
-				   g_object_path: '/org/gnome/ScreenSaver',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-    self.init(null);
-    self.screenSaverActive = false;
-
-    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
-        self.screenSaverActive = isActive;
-    });
-    self.connect('notify::g-name-owner', function() {
-        if (self.g_name_owner) {
-            self.GetActiveRemote(function(result, excp) {
-                if (result) {
-                    let [isActive] = result;
-                    self.screenSaverActive = isActive;
-                }
-            });
-        } else
-            self.screenSaverActive = false;
-    });
-
-    return self;
-}

js/misc/util.js

@@ -1,9 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 
@@ -83,24 +80,33 @@ function spawnCommandLine(command_line) {
 // this will throw an error.
 function trySpawn(argv)
 {
+    var success, pid;
     try {
-        GLib.spawn_async(null, argv, null,
+        [success, pid] = GLib.spawn_async(null, argv, null,
-                         GLib.SpawnFlags.SEARCH_PATH,
+                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                         null, null);
+                                          null);
     } catch (err) {
-        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
+        /* Rewrite the error in case of ENOENT */
-            err.message = _("Command not found");
+        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
-        } else {
+            throw new GLib.SpawnError({ code: GLib.SpawnError.NOENT,
+                                        message: _("Command not found") });
+        } else if (err instanceof GLib.Error) {
             // The exception from gjs contains an error string like:
             //   Error invoking GLib.spawn_command_line_async: Failed to
             //   execute child process "foo" (No such file or directory)
             // We are only interested in the part in the parentheses. (And
             // we can't pattern match the text, since it gets localized.)
-            err.message = err.message.replace(/.*\((.+)\)/, '$1');
+            let message = err.message.replace(/.*\((.+)\)/, '$1');
+            throw new (err.constructor)({ code: err.code,
+                                          message: message });
+        } else {
+            throw err;
         }
-
-        throw err;
     }
+    // Dummy child watch; we don't want to double-fork internally
+    // because then we lose the parent-child relationship, which
+    // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
+    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }
 
 // trySpawnCommandLine:
@@ -144,7 +150,7 @@ function killall(processName) {
         // whatever...
 
         let argv = ['pkill', '-f', '^([^ ]*/)?' + processName + '($| )'];
-        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null);
         // It might be useful to return success/failure, but we'd need
         // a wrapper around WIFEXITED and WEXITSTATUS. Since none of
         // the current callers care, we don't bother.
@@ -232,3 +238,53 @@ function fixupPCIDescription(desc) {
 
     return out.join(' ');
 }
+
+// lowerBound:
+// @array: an array or array-like object, already sorted
+//         according to @cmp
+// @val: the value to add
+// @cmp: a comparator (or undefined to compare as numbers)
+//
+// Returns the position of the first element that is not
+// lower than @val, according to @cmp.
+// That is, returns the first position at which it
+// is possible to insert @val without violating the
+// order.
+// This is quite like an ordinary binary search, except
+// that it doesn't stop at first element comparing equal.
+
+function lowerBound(array, val, cmp) {
+    let min, max, mid, v;
+    cmp = cmp || function(a, b) { return a - b; };
+
+    if (array.length == 0)
+        return 0;
+
+    min = 0; max = array.length;
+    while (min < (max - 1)) {
+        mid = Math.floor((min + max) / 2);
+        v = cmp(array[mid], val);
+
+        if (v < 0)
+            min = mid + 1;
+        else
+            max = mid;
+    }
+
+    return (min == max || cmp(array[min], val) < 0) ? max : min;
+}
+
+// insertSorted:
+// @array: an array sorted according to @cmp
+// @val: a value to insert
+// @cmp: the sorting function
+//
+// Inserts @val into @array, preserving the
+// sorting invariants.
+// Returns the position at which it was inserted
+function insertSorted(array, val, cmp) {
+    let pos = lowerBound(array, val, cmp);
+    array.splice(pos, 0, val);
+
+    return pos;
+}

js/perf/core.js

@@ -1,5 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const System = imports.system;
+
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 
@@ -99,7 +101,7 @@ function run() {
         Main.overview.hide();
         yield Scripting.waitLeisure();
 
-        global.gc();
+        System.gc();
         yield Scripting.sleep(1000);
         Scripting.collectStatistics();
         Scripting.scriptEvent('afterShowHide');
@@ -113,10 +115,10 @@ function run() {
 
     for (let i = 0; i < 2; i++) {
         Scripting.scriptEvent('applicationsShowStart');
-        Main.overview._viewSelector.switchTab('applications');
+        Main.overview._dash.showAppsButton.checked = true;
         yield Scripting.waitLeisure();
         Scripting.scriptEvent('applicationsShowDone');
-        Main.overview._viewSelector.switchTab('windows');
+        Main.overview._dash.showAppsButton.checked = false;
         yield Scripting.waitLeisure();
     }
 }

js/ui/appDisplay.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const GMenu = imports.gi.GMenu;
@@ -10,6 +11,7 @@ const Signals = imports.signals;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;
+const Atk = imports.gi.Atk;
 
 const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
@@ -17,26 +19,25 @@ const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
-const Search = imports.ui.search;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 const Params = imports.misc.params;
+const Util = imports.misc.util;
 
 const MAX_APPLICATION_WORK_MILLIS = 75;
 const MENU_POPUP_TIMEOUT = 600;
 const SCROLL_TIME = 0.1;
 
-function AlphabeticalView() {
+const AlphabeticalView = new Lang.Class({
-    this._init();
+    Name: 'AlphabeticalView',
-}
 
-AlphabeticalView.prototype = {
     _init: function() {
         this._grid = new IconGrid.IconGrid({ xAlign: St.Align.START });
         this._appSystem = Shell.AppSystem.get_default();
 
         this._pendingAppLaterId = 0;
         this._appIcons = {}; // desktop file id
+        this._allApps = [];
 
         let box = new St.BoxLayout({ vertical: true });
         box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
@@ -47,30 +48,34 @@ AlphabeticalView.prototype = {
                                          style_class: 'vfade' });
         this.actor.add_actor(box);
         this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.actor.connect('notify::mapped', Lang.bind(this,
+        let action = new Clutter.PanAction({ interpolate: true });
-            function() {
+        action.connect('pan', Lang.bind(this, this._onPan));
-                if (!this.actor.mapped)
+        this.actor.add_action(action);
-                    return;
-
-                let adjustment = this.actor.vscroll.adjustment;
-                let direction = Overview.SwipeScrollDirection.VERTICAL;
-                Main.overview.setScrollAdjustment(adjustment, direction);
-
-                // Reset scroll on mapping
-                adjustment.value = 0;
-            }));
     },
 
-    _removeAll: function() {
+    _onPan: function(action) {
+        let [dist, dx, dy] = action.get_motion_delta(0);
+        let adjustment = this.actor.vscroll.adjustment;
+        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
+        return false;
+    },
+
+    removeAll: function() {
         this._grid.removeAll();
         this._appIcons = {};
+        this._allApps = [];
     },
 
-    _addApp: function(app) {
+    addApp: function(app) {
         var id = app.get_id();
-        let appIcon = new AppWellIcon(app);
+        if (this._appIcons[id] !== undefined)
+            return;
 
-        this._grid.addItem(appIcon.actor);
+        let appIcon = new AppWellIcon(app);
+        let pos = Util.insertSorted(this._allApps, app, function(a, b) {
+            return a.compare_by_name(b);
+        });
+        this._grid.addItem(appIcon.actor, pos);
         appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));
 
         this._appIcons[id] = appIcon;
@@ -121,22 +126,12 @@ AlphabeticalView.prototype = {
                 icon.actor.visible = true;
             }
         }
-    },
-
-    setAppList: function(apps) {
-        this._removeAll();
-        for (var i = 0; i < apps.length; i++) {
-            var app = apps[i];
-            this._addApp(app);
-         }
     }
-};
+});
 
-function ViewByCategories() {
+const ViewByCategories = new Lang.Class({
-    this._init();
+    Name: 'ViewByCategories',
-}
 
-ViewByCategories.prototype = {
     _init: function() {
         this._appSystem = Shell.AppSystem.get_default();
         this.actor = new St.BoxLayout({ style_class: 'all-app' });
@@ -150,9 +145,10 @@ ViewByCategories.prototype = {
         // (used only before the actor is mapped the first time)
         this._currentCategory = -2;
         this._categories = [];
-        this._apps = null;
 
-        this._categoryBox = new St.BoxLayout({ vertical: true, reactive: true });
+        this._categoryBox = new St.BoxLayout({ vertical: true,
+                                               reactive: true,
+                                               accessible_role: Atk.Role.LIST });
         this._categoryScroll = new St.ScrollView({ x_fill: false,
                                                    y_fill: false,
                                                    style_class: 'vfade' });
@@ -205,54 +201,61 @@ ViewByCategories.prototype = {
             if (nextType == GMenu.TreeItemType.ENTRY) {
                 var entry = iter.get_entry();
                 var app = this._appSystem.lookup_app_by_tree_entry(entry);
-                if (!entry.get_app_info().get_nodisplay())
+                if (!entry.get_app_info().get_nodisplay()) {
+                    this._view.addApp(app);
                     appList.push(app);
+                }
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                if (!dir.get_is_nodisplay())
+                var itemDir = iter.get_directory();
-                    this._loadCategory(iter.get_directory(), appList);
+                if (!itemDir.get_is_nodisplay())
+                    this._loadCategory(itemDir, appList);
             }
         }
     },
 
-    _addCategory: function(name, index, dir, allApps) {
+    _addCategory: function(name, index, dir) {
+        let apps;
+
+        if (dir != null) {
+            apps = [];
+            this._loadCategory(dir, apps);
+
+            if (apps.length == 0)
+                return false;
+        }
+
         let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
                                      style_class: 'app-filter',
                                      x_align: St.Align.START,
-                                     can_focus: true });
+                                     can_focus: true ,
+                                     accessible_role: Atk.Role.LIST_ITEM });
         button.connect('clicked', Lang.bind(this, function() {
             this._selectCategory(index);
         }));
 
-        var apps;
         if (dir == null) {
-            apps = allApps;
             this._allCategoryButton = button;
         } else {
-            apps = [];
-            this._loadCategory(dir, apps);
             this._categories.push({ apps: apps,
                                     name: name,
                                     button: button });
         }
 
         this._categoryBox.add(button, { expand: true, x_fill: true, y_fill: false });
+        return true;
     },
 
     _removeAll: function() {
+        this._view.removeAll();
         this._categories = [];
-        this._categoryBox.destroy_children();
+        this._categoryBox.destroy_all_children();
     },
 
     refresh: function() {
         this._removeAll();
 
-        var allApps = Shell.AppSystem.get_default().get_all();
-        allApps.sort(function(a, b) {
-            return a.compare_by_name(b);
-        });
-
         /* Translators: Filter to display all applications */
-        this._addCategory(_("All"), -1, null, allApps);
+        this._addCategory(_("All"), -1, null);
 
         var tree = this._appSystem.get_tree();
         var root = tree.get_root_directory();
@@ -265,12 +268,12 @@ ViewByCategories.prototype = {
                 var dir = iter.get_directory();
                 if (dir.get_is_nodisplay())
                     continue;
-                this._addCategory(dir.get_name(), i, dir);
+
-                i++;
+                if (this._addCategory(dir.get_name(), i, dir))
+                    i++;
             }
         }
 
-        this._view.setAppList(allApps);
         this._selectCategory(-1);
 
         if (this._focusDummy) {
@@ -281,16 +284,14 @@ ViewByCategories.prototype = {
                 this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
         }
     }
-};
+});
 
 /* This class represents a display containing a collection of application items.
  * The applications are sorted based on their name.
  */
-function AllAppDisplay() {
+const AllAppDisplay = new Lang.Class({
-    this._init();
+    Name: 'AllAppDisplay',
-}
 
-AllAppDisplay.prototype = {
     _init: function() {
         this._appSystem = Shell.AppSystem.get_default();
         this._appSystem.connect('installed-changed', Lang.bind(this, function() {
@@ -306,49 +307,47 @@ AllAppDisplay.prototype = {
     _redisplay: function() {
         this._appView.refresh();
     }
-};
+});
 
-function AppSearchProvider() {
+const AppSearchProvider = new Lang.Class({
-    this._init();
+    Name: 'AppSearchProvider',
-}
-
-AppSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
 
     _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("APPLICATIONS"));
         this._appSys = Shell.AppSystem.get_default();
+        this.id = 'applications';
     },
 
-    getResultMeta: function(app) {
+    getResultMetas: function(apps, callback) {
-        return { 'id': app,
+        let metas = [];
-                 'name': app.get_name(),
+        for (let i = 0; i < apps.length; i++) {
-                 'createIcon': function(size) {
+            let app = apps[i];
-                                   return app.create_icon_texture(size);
+            metas.push({ 'id': app,
-                               }
+                         'name': app.get_name(),
-               };
+                         'createIcon': function(size) {
+                             return app.create_icon_texture(size);
+                         }
+                       });
+        }
+        callback(metas);
     },
 
     getInitialResultSet: function(terms) {
-        return this._appSys.initial_search(terms);
+        this.searchSystem.pushResults(this, this._appSys.initial_search(terms));
     },
 
     getSubsearchResultSet: function(previousResults, terms) {
-        return this._appSys.subsearch(previousResults, terms);
+        this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
     },
 
-    activateResult: function(app, params) {
+    activateResult: function(app) {
-        params = Params.parse(params, { workspace: -1,
-                                        timestamp: 0 });
-
         let event = Clutter.get_current_event();
-        let modifiers = event ? Shell.get_event_state(event) : 0;
+        let modifiers = event ? event.get_state() : 0;
         let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
 
         if (openNewWindow)
-            app.open_new_window(params.workspace);
+            app.open_new_window(-1);
         else
-            app.activate_full(params.workspace, params.timestamp);
+            app.activate();
     },
 
     dragActivateResult: function(id, params) {
@@ -364,83 +363,66 @@ AppSearchProvider.prototype = {
         let icon = new AppWellIcon(app);
         return icon.actor;
     }
-};
+});
 
-function SettingsSearchProvider() {
+const SettingsSearchProvider = new Lang.Class({
-    this._init();
+    Name: 'SettingsSearchProvider',
-}
-
-SettingsSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
 
     _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("SETTINGS"));
+        this.appInfo = Gio.DesktopAppInfo.new('gnome-control-center.desktop');
         this._appSys = Shell.AppSystem.get_default();
-        this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
     },
 
-    getResultMeta: function(pref) {
+    getResultMetas: function(prefs, callback) {
-        return { 'id': pref,
+        let metas = [];
-                 'name': pref.get_name(),
+        for (let i = 0; i < prefs.length; i++) {
-                 'createIcon': function(size) {
+            let pref = prefs[i];
-                                   return pref.create_icon_texture(size);
+            metas.push({ 'id': pref,
-                               }
+                         'name': pref.get_name(),
-               };
+                         'createIcon': function() { return null; }
+                       });
+        }
+        callback(metas);
     },
 
     getInitialResultSet: function(terms) {
-        return this._appSys.search_settings(terms);
+        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
     },
 
     getSubsearchResultSet: function(previousResults, terms) {
-        return this._appSys.search_settings(terms);
+        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
     },
 
-    activateResult: function(pref, params) {
+    activateResult: function(pref) {
-        params = Params.parse(params, { workspace: -1,
+        pref.activate();
-                                        timestamp: 0 });
-
-        pref.activate_full(params.workspace, params.timestamp);
     },
 
-    dragActivateResult: function(pref, params) {
+    launchSearch: function(terms) {
-        this.activateResult(pref, params);
+        // FIXME: this should be a remote search provider
-    },
+        this.appInfo.launch([], global.create_app_launch_context());
-
-    createResultActor: function (resultMeta, terms) {
-        let app = resultMeta['id'];
-        let icon = new AppWellIcon(app);
-        return icon.actor;
     }
-};
+});
 
-function AppIcon(app, params) {
+const AppIcon = new Lang.Class({
-    this._init(app, params);
+    Name: 'AppIcon',
-}
+    Extends: IconGrid.BaseIcon,
-
-AppIcon.prototype = {
-    __proto__:  IconGrid.BaseIcon.prototype,
 
     _init : function(app, params) {
         this.app = app;
 
         let label = this.app.get_name();
 
-        IconGrid.BaseIcon.prototype._init.call(this,
+        this.parent(label, params);
-                                               label,
-                                               params);
     },
 
     createIcon: function(iconSize) {
         return this.app.create_icon_texture(iconSize);
     }
-};
+});
 
-function AppWellIcon(app, iconParams, onActivateOverride) {
+const AppWellIcon = new Lang.Class({
-    this._init(app, iconParams, onActivateOverride);
+    Name: 'AppWellIcon',
-}
 
-AppWellIcon.prototype = {
     _init : function(app, iconParams, onActivateOverride) {
         this.app = app;
         this.actor = new St.Button({ style_class: 'app-well-app',
@@ -568,9 +550,11 @@ AppWellIcon.prototype = {
             this._menuManager.addMenu(this._menu);
         }
 
+        this.emit('menu-state-changed', true);
+
         this.actor.set_hover(true);
-        this.actor.show_tooltip();
         this._menu.popup();
+        this._menuManager.ignoreRelease();
 
         return false;
     },
@@ -585,11 +569,12 @@ AppWellIcon.prototype = {
 
     _onMenuPoppedDown: function() {
         this.actor.sync_hover();
+        this.emit('menu-state-changed', false);
     },
 
     _onActivate: function (event) {
         this.emit('launching');
-        let modifiers = Shell.get_event_state(event);
+        let modifiers = event.get_state();
 
         if (this._onActivateOverride) {
             this._onActivateOverride(event);
@@ -620,22 +605,19 @@ AppWellIcon.prototype = {
     getDragActorSource: function() {
         return this.icon.icon;
     }
-};
+});
 Signals.addSignalMethods(AppWellIcon.prototype);
 
-function AppIconMenu(source) {
+const AppIconMenu = new Lang.Class({
-    this._init(source);
+    Name: 'AppIconMenu',
-}
+    Extends: PopupMenu.PopupMenu,
-
-AppIconMenu.prototype = {
-    __proto__: PopupMenu.PopupMenu.prototype,
 
     _init: function(source) {
         let side = St.Side.LEFT;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             side = St.Side.RIGHT;
 
-        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, 0.5, side);
+        this.parent(source.actor, 0.5, side);
 
         // We want to keep the item hovered while the menu is up
         this.blockSourceEvents = true;
@@ -723,5 +705,5 @@ AppIconMenu.prototype = {
         }
         this.close();
     }
-};
+});
 Signals.addSignalMethods(AppIconMenu.prototype);

js/ui/appFavorites.js

@@ -6,11 +6,9 @@ const Signals = imports.signals;
 
 const Main = imports.ui.main;
 
-function AppFavorites() {
+const AppFavorites = new Lang.Class({
-    this._init();
+    Name: 'AppFavorites',
-}
 
-AppFavorites.prototype = {
     FAVORITE_APPS_KEY: 'favorite-apps',
 
     _init: function() {
@@ -86,9 +84,12 @@ AppFavorites.prototype = {
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
-            this._removeFavorite(appId);
+                                 { forFeedback: true,
-        }));
+                                   undoCallback: Lang.bind(this, function () {
+                                                               this._removeFavorite(appId);
+                                                           })
+                                 });
     },
 
     addFavorite: function(appId) {
@@ -118,11 +119,13 @@ AppFavorites.prototype = {
             return;
 
         Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 Lang.bind(this, function () {
+                                 { forFeedback: true,
-            this._addFavorite(appId, pos);
+                                   undoCallback: Lang.bind(this, function () {
-        }));
+                                                               this._addFavorite(appId, pos);
+                                                           })
+                                 });
     }
-};
+});
 Signals.addSignalMethods(AppFavorites.prototype);
 
 var appFavoritesInstance = null;

js/ui/automountManager.js

@@ -1,271 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Gio = imports.gi.Gio;
-const Params = imports.misc.params;
-
-const Main = imports.ui.main;
-const ShellMountOperation = imports.ui.shellMountOperation;
-const ScreenSaver = imports.misc.screenSaver;
-
-// GSettings keys
-const SETTINGS_SCHEMA = 'org.gnome.desktop.media-handling';
-const SETTING_ENABLE_AUTOMOUNT = 'automount';
-
-const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
-
-const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
-<method name="IsActive">
-    <arg type="b" direction="out" />
-</method>
-<signal name="ActiveChanged">
-    <arg type="b" direction="out" />
-</signal>
-</interface>;
-
-const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
-
-const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
-<method name="GetCurrentSession">
-    <arg type="o" direction="out" />
-</method>
-</interface>;
-
-const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
-
-function ConsoleKitManager() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-				   g_interface_name: ConsoleKitManagerInfo.name,
-				   g_interface_info: ConsoleKitManagerInfo,
-				   g_name: 'org.freedesktop.ConsoleKit',
-				   g_object_path: '/org/freedesktop/ConsoleKit/Manager',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-
-    self.connect('notify::g-name-owner', function() {
-        if (self.g_name_owner) {
-            self.GetCurrentSessionRemote(function([session]) {
-                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
-
-                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
-                    self.sessionActive = isActive;
-                });
-                self._ckSession.IsActiveRemote(function([isActive]) {
-                    self.sessionActive = isActive;
-                });
-            });
-        } else {
-            self.sessionActive = true;
-        }
-    });
-
-    self.init(null);
-    return self;
-}
-
-function AutomountManager() {
-    this._init();
-}
-
-AutomountManager.prototype = {
-    _init: function() {
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
-        this._volumeQueue = [];
-
-        this.ckListener = new ConsoleKitManager();
-
-        this._ssProxy = new ScreenSaver.ScreenSaverProxy();
-        this._ssProxy.connectSignal('ActiveChanged',
-                                    Lang.bind(this, this._screenSaverActiveChanged));
-
-        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));
-
-        Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-    },
-
-    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
-        if (!isActive) {
-            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) {
-            this._checkAndMountVolume(volume, { checkSession: false,
-                                                useMountOp: false });
-        }));
-
-        return false;
-    },
-
-    _onDriveConnected: function() {
-        // if we're not in the current ConsoleKit session,
-        // or screensaver is active, don't play sounds
-        if (!this.ckListener.sessionActive)
-            return;        
-
-        if (this._ssProxy.screenSaverActive)
-            return;
-
-        global.play_theme_sound(0, 'device-added-media');
-    },
-
-    _onDriveDisconnected: function() {
-        // if we're not in the current ConsoleKit session,
-        // or screensaver is active, don't play sounds
-        if (!this.ckListener.sessionActive)
-            return;        
-
-        if (this._ssProxy.screenSaverActive)
-            return;
-
-        global.play_theme_sound(0, 'device-removed-media');        
-    },
-
-    _onDriveEjectButton: function(monitor, drive) {
-        // TODO: this code path is not tested, as the GVfs volume monitor
-        // doesn't emit this signal just yet.
-        if (!this.ckListener.sessionActive)
-            return;
-
-        // we force stop/eject in this case, so we don't have to pass a
-        // mount operation object
-        if (drive.can_stop()) {
-            drive.stop
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 Lang.bind(this, function(drive, res) {
-                     try {
-                         drive.stop_finish(res);
-                     } catch (e) {
-                         log("Unable to stop the drive after drive-eject-button " + e.toString());
-                     }
-                 }));
-        } else if (drive.can_eject()) {
-            drive.eject_with_operation 
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 Lang.bind(this, function(drive, res) {
-                     try {
-                         drive.eject_with_operation_finish(res);
-                     } catch (e) {
-                         log("Unable to eject the drive after drive-eject-button " + e.toString());
-                     }
-                 }));
-        }
-    },
-
-    _onVolumeAdded: function(monitor, volume) {
-        this._checkAndMountVolume(volume);
-    },
-
-    _checkAndMountVolume: function(volume, params) {
-        params = Params.parse(params, { checkSession: true,
-                                        useMountOp: true });
-
-        if (params.checkSession) {
-            // if we're not in the current ConsoleKit session,
-            // don't attempt automount
-            if (!this.ckListener.sessionActive)
-                return;
-
-            if (this._ssProxy.screenSaverActive) {
-                if (this._volumeQueue.indexOf(volume) == -1)
-                    this._volumeQueue.push(volume);
-
-                return;
-            }
-        }
-
-        // Volume is already mounted, don't bother.
-        if (volume.get_mount())
-            return;
-
-        if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
-            !volume.should_automount() ||
-            !volume.can_mount()) {
-            // allow the autorun to run anyway; this can happen if the
-            // mount gets added programmatically later, even if 
-            // should_automount() or can_mount() are false, like for
-            // blank optical media.
-            this._allowAutorun(volume);
-            this._allowAutorunExpire(volume);
-
-            return;
-        }
-
-        if (params.useMountOp) {
-            let operation = new ShellMountOperation.ShellMountOperation(volume);
-            this._mountVolume(volume, operation.mountOp);
-        } else {
-            this._mountVolume(volume, null);
-        }
-    },
-
-    _mountVolume: function(volume, operation) {
-        this._allowAutorun(volume);
-        volume.mount(0, operation, null,
-                     Lang.bind(this, this._onVolumeMounted));
-    },
-
-    _onVolumeMounted: function(volume, res) {
-        this._allowAutorunExpire(volume);
-
-        try {
-            volume.mount_finish(res);
-        } catch (e) {
-            let string = e.toString();
-
-            // FIXME: needs proper error code handling instead of this
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            if (string.indexOf('No key available with this passphrase') != -1)
-                this._reaskPassword(volume);
-            else
-                log('Unable to mount volume ' + volume.get_name() + ': ' + string);
-        }
-    },
-
-    _onVolumeRemoved: function(monitor, volume) {
-        this._volumeQueue = 
-            this._volumeQueue.filter(function(element) {
-                return (element != volume);
-            });
-    },
-
-    _reaskPassword: function(volume) {
-        let operation = new ShellMountOperation.ShellMountOperation(volume, { reaskPassword: true });
-        this._mountVolume(volume, operation.mountOp);        
-    },
-
-    _allowAutorun: function(volume) {
-        volume.allowAutorun = true;
-    },
-
-    _allowAutorunExpire: function(volume) {
-        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
-            volume.allowAutorun = false;
-            return false;
-        });
-    }
-}

js/ui/boxpointer.js

@@ -9,6 +9,13 @@ const Shell = imports.gi.Shell;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
+const PopupAnimation = {
+    NONE:  0,
+    SLIDE: 1 << 0,
+    FADE:  1 << 1,
+    FULL:  ~0,
+};
+
 const POPUP_ANIMATION_TIME = 0.15;
 
 /**
@@ -18,16 +25,18 @@ const POPUP_ANIMATION_TIME = 0.15;
  *
  * An actor which displays a triangle "arrow" pointing to a given
  * side.  The .bin property is a container in which content can be
- * placed.  The arrow position may be controlled via setArrowOrigin().
+ * placed.  The arrow position may be controlled via
+ * setArrowOrigin(). The arrow side might be temporarily flipped
+ * depending on the box size and source position to keep the box
+ * totally inside the monitor if possible.
  *
  */
-function BoxPointer(side, binProperties) {
+const BoxPointer = new Lang.Class({
-    this._init(side, binProperties);
+    Name: 'BoxPointer',
-}
 
-BoxPointer.prototype = {
     _init: function(arrowSide, binProperties) {
         this._arrowSide = arrowSide;
+        this._userArrowSide = arrowSide;
         this._arrowOrigin = 0;
         this.actor = new St.Bin({ x_fill: true,
                                   y_fill: true });
@@ -47,16 +56,36 @@ BoxPointer.prototype = {
         this._xPosition = 0;
         this._yPosition = 0;
         this._sourceAlignment = 0.5;
+        this._capturedEventId = 0;
+        this._muteInput();
+    },
+
+    _muteInput: function() {
+        if (this._capturedEventId == 0)
+            this._capturedEventId = this.actor.connect('captured-event',
+                                                       function() { return true; });
+    },
+
+    _unmuteInput: function() {
+        if (this._capturedEventId != 0) {
+            this.actor.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
     },
 
     show: function(animate, onComplete) {
         let themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
+        let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
+
+        if (animate & PopupAnimation.FADE)
+            this.opacity = 0;
+        else
+            this.opacity = 255;
 
-        this.opacity = 0;
         this.actor.show();
 
-        if (animate) {
+        if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
                     this.yOffset = -rise;
@@ -77,8 +106,12 @@ BoxPointer.prototype = {
                                  xOffset: 0,
                                  yOffset: 0,
                                  transition: 'linear',
-                                 onComplete: onComplete,
+                                 onComplete: Lang.bind(this, function() {
-                                 time: POPUP_ANIMATION_TIME });
+                                     this._unmuteInput();
+                                     if (onComplete)
+                                         onComplete();
+                                 }),
+                                 time: animationTime });
     },
 
     hide: function(animate, onComplete) {
@@ -86,8 +119,10 @@ BoxPointer.prototype = {
         let yOffset = 0;
         let themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
+        let fade = (animate & PopupAnimation.FADE);
+        let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
 
-        if (animate) {
+        if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
                     yOffset = rise;
@@ -104,13 +139,17 @@ BoxPointer.prototype = {
             }
         }
 
-        Tweener.addTween(this, { opacity: 0,
+        this._muteInput();
+
+        Tweener.removeTweens(this);
+        Tweener.addTween(this, { opacity: fade ? 0 : 255,
                                  xOffset: xOffset,
                                  yOffset: yOffset,
                                  transition: 'linear',
-                                 time: POPUP_ANIMATION_TIME,
+                                 time: animationTime,
                                  onComplete: Lang.bind(this, function () {
                                      this.actor.hide();
+                                     this.opacity = 0;
                                      this.xOffset = 0;
                                      this.yOffset = 0;
                                      if (onComplete)
@@ -180,8 +219,27 @@ BoxPointer.prototype = {
         }
         this.bin.allocate(childBox, flags);
 
-        if (this._sourceActor && this._sourceActor.mapped)
+        if (this._sourceActor && this._sourceActor.mapped) {
             this._reposition(this._sourceActor, this._arrowAlignment);
+
+            if (this._shouldFlip()) {
+                switch (this._arrowSide) {
+                case St.Side.TOP:
+                    this._arrowSide = St.Side.BOTTOM;
+                    break;
+                case St.Side.BOTTOM:
+                    this._arrowSide = St.Side.TOP;
+                    break;
+                case St.Side.LEFT:
+                    this._arrowSide = St.Side.RIGHT;
+                    break;
+                case St.Side.RIGHT:
+                    this._arrowSide = St.Side.LEFT;
+                    break;
+                }
+                this._reposition(this._sourceActor, this._arrowAlignment);
+            }
+        }
     },
 
     _drawBorder: function(area) {
@@ -195,7 +253,6 @@ BoxPointer.prototype = {
         let halfBorder = borderWidth / 2;
         let halfBase = Math.floor(base/2);
 
-        let borderColor = themeNode.get_color('-arrow-border-color');
         let backgroundColor = themeNode.get_color('-arrow-background-color');
 
         let [width, height] = area.get_surface_size();
@@ -206,7 +263,6 @@ BoxPointer.prototype = {
             boxWidth -= rise;
         }
         let cr = area.get_context();
-        Clutter.cairo_set_source_color(cr, borderColor);
 
         // Translate so that box goes from 0,0 to boxWidth,boxHeight,
         // with the arrow poking out of that
@@ -219,14 +275,51 @@ BoxPointer.prototype = {
         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))) {
+            if (skipTopLeft) {
-                cr.lineTo(this._arrowOrigin, y1 - rise);
+                cr.moveTo(x1, y2 - borderRadius);
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
+                cr.lineTo(x1, y1 - rise);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1 + halfBase, y1);
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
+            } else if (skipTopRight) {
-                cr.lineTo(this._arrowOrigin, y1 - rise);
+                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);
@@ -234,19 +327,20 @@ BoxPointer.prototype = {
             }
         }
 
-        cr.lineTo(x2 - borderRadius, y1);
+        if (!skipTopRight) {
-
+            cr.lineTo(x2 - borderRadius, y1);
-        // top-right corner
+            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+                   3*Math.PI/2, Math.PI*2);
-               3*Math.PI/2, Math.PI*2);
+        }
 
         if (this._arrowSide == St.Side.RIGHT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+            if (skipTopRight) {
-                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2 + rise, y1);
-                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+                cr.lineTo(x2 + rise, y1 + halfBase);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+            } else if (skipBottomRight) {
-                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x2, y2 - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2 + rise, y2);
+                cr.lineTo(x2 - borderRadius, y2);
             } else {
                 cr.lineTo(x2, this._arrowOrigin - halfBase);
                 cr.lineTo(x2 + rise, this._arrowOrigin);
@@ -254,19 +348,20 @@ BoxPointer.prototype = {
             }
         }
 
-        cr.lineTo(x2, y2 - borderRadius);
+        if (!skipBottomRight) {
-
+            cr.lineTo(x2, y2 - borderRadius);
-        // bottom-right corner
+            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+                   0, Math.PI/2);
-               0, Math.PI/2);
+        }
 
         if (this._arrowSide == St.Side.BOTTOM) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+            if (skipBottomLeft) {
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
+                cr.lineTo(x1 + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
+                cr.lineTo(x1, y2 + rise);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1, y2 - borderRadius);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
+            } else if (skipBottomRight) {
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
+                cr.lineTo(x2, y2 + rise);
+                cr.lineTo(x2 - halfBase, y2);
             } else {
                 cr.lineTo(this._arrowOrigin + halfBase, y2);
                 cr.lineTo(this._arrowOrigin, y2 + rise);
@@ -274,19 +369,20 @@ BoxPointer.prototype = {
             }
         }
 
-        cr.lineTo(x1 + borderRadius, y2);
+        if (!skipBottomLeft) {
-
+            cr.lineTo(x1 + borderRadius, y2);
-        // bottom-left corner
+            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+                   Math.PI/2, Math.PI);
-               Math.PI/2, Math.PI);
+        }
 
         if (this._arrowSide == St.Side.LEFT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+            if (skipTopLeft) {
-                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+                cr.lineTo(x1, y1 + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
+                cr.lineTo(x1 - rise, y1);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1 + borderRadius, y1);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
+            } else if (skipBottomLeft) {
-                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x1 - rise, y2)
+                cr.lineTo(x1 - rise, y2 - halfBase);
             } else {
                 cr.lineTo(x1, this._arrowOrigin + halfBase);
                 cr.lineTo(x1 - rise, this._arrowOrigin);
@@ -294,20 +390,26 @@ BoxPointer.prototype = {
             }
         }
 
-        cr.lineTo(x1, y1 + borderRadius);
+        if (!skipTopLeft) {
-
+            cr.lineTo(x1, y1 + borderRadius);
-        // top-left corner
+            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+                   Math.PI, 3*Math.PI/2);
-               Math.PI, 3*Math.PI/2);
+        }
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
         cr.fillPreserve();
-        Clutter.cairo_set_source_color(cr, borderColor);
+
-        cr.setLineWidth(borderWidth);
+        if (borderWidth > 0) {
-        cr.stroke();
+            let borderColor = themeNode.get_color('-arrow-border-color');
+            Clutter.cairo_set_source_color(cr, borderColor);
+            cr.setLineWidth(borderWidth);
+            cr.stroke();
+        }
     },
 
     setPosition: function(sourceActor, alignment) {
+        this._arrowSide = this._userArrowSide;
+
         // We need to show it now to force an allocation,
         // so that we can query the correct size.
         this.actor.show();
@@ -324,11 +426,7 @@ BoxPointer.prototype = {
         if (!this._sourceActor)
             return;
 
-        // We need to show it now to force an allocation,
+        this.setPosition(this._sourceActor, this._arrowAlignment);
-        // so that we can query the correct size.
-        this.actor.show();
-
-        this._reposition(this._sourceActor, this._arrowAlignment);
     },
 
     _reposition: function(sourceActor, alignment) {
@@ -349,10 +447,9 @@ BoxPointer.prototype = {
         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');
 
         let resX, resY;
 
@@ -371,29 +468,66 @@ BoxPointer.prototype = {
             break;
         }
 
-        // Now align and position the pointing axis, making sure
+        // Now align and position the pointing axis, making sure it fits on
-        // it fits on screen
+        // 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:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, monitor.x + 10);
+            resX = Math.max(resX, monitor.x + padding);
-            resX = Math.min(resX, monitor.x + monitor.width - (10 + natWidth));
+            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:
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, monitor.y + 10);
+            resY = Math.max(resY, monitor.y + padding);
-            resY = Math.min(resY, monitor.y + monitor.height - (10 + natHeight));
+            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) {
@@ -427,6 +561,39 @@ BoxPointer.prototype = {
                                     -(this._yPosition + this._yOffset));
     },
 
+    _shouldFlip: function() {
+        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
+        let boxAllocation = Shell.util_get_transformed_allocation(this.actor);
+        let boxWidth = boxAllocation.x2 - boxAllocation.x1;
+        let boxHeight = boxAllocation.y2 - boxAllocation.y1;
+        let monitor = Main.layoutManager.findMonitorForActor(this.actor);
+
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+            if (boxAllocation.y2 > monitor.y + monitor.height &&
+                boxHeight < sourceAllocation.y1 - monitor.y)
+                return true;
+            break;
+        case St.Side.BOTTOM:
+            if (boxAllocation.y1 < monitor.y &&
+                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
+                return true;
+            break;
+        case St.Side.LEFT:
+            if (boxAllocation.x2 > monitor.x + monitor.width &&
+                boxWidth < sourceAllocation.x1 - monitor.x)
+                return true;
+            break;
+        case St.Side.RIGHT:
+            if (boxAllocation.x1 < monitor.x &&
+                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
+                return true;
+            break;
+        }
+
+        return false;
+    },
+
     set xOffset(offset) {
         this._xOffset = offset;
         this._shiftActor();
@@ -452,4 +619,4 @@ BoxPointer.prototype = {
     get opacity() {
         return this.actor.opacity;
     }
-};
+});

js/ui/calendar.js

@@ -11,7 +11,6 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
-const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 
 // in org.gnome.desktop.interface
@@ -95,15 +94,6 @@ function _getCalendarWeekForDate(date) {
     return weekNumber;
 }
 
-function _getDigitWidth(actor){
-    let context = actor.get_pango_context();
-    let themeNode = actor.get_theme_node();
-    let font = themeNode.get_font();
-    let metrics = context.get_metrics(font, context.get_language());
-    let width = metrics.get_approximate_digit_width();
-    return width;
-}
-
 function _getCalendarDayAbbreviation(dayNumber) {
     let abbreviations = [
         /* Translators: Calendar grid abbreviation for Sunday.
@@ -155,28 +145,24 @@ function _getEventDayAbbreviation(dayNumber) {
 
 // Abstraction for an appointment/event in a calendar
 
-function CalendarEvent(date, end, summary, allDay) {
+const CalendarEvent = new Lang.Class({
-    this._init(date, end, summary, allDay);
+    Name: 'CalendarEvent',
-}
 
-CalendarEvent.prototype = {
     _init: function(date, end, summary, allDay) {
         this.date = date;
         this.end = end;
         this.summary = summary;
         this.allDay = allDay;
     }
-};
+});
 
 // Interface for appointments/events - e.g. the contents of a calendar
 //
 
 // First, an implementation with no events
-function EmptyEventSource() {
+const EmptyEventSource = new Lang.Class({
-    this._init();
+    Name: 'EmptyEventSource',
-}
 
-EmptyEventSource.prototype = {
     _init: function() {
     },
 
@@ -191,7 +177,7 @@ EmptyEventSource.prototype = {
     hasEvents: function(day) {
         return false;
     }
-};
+});
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
 const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
@@ -208,22 +194,16 @@ const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIfac
 
 function CalendarServer() {
     var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-				   g_interface_name: CalendarServerInfo.name,
+                                   g_interface_name: CalendarServerInfo.name,
-				   g_interface_info: CalendarServerInfo,
+                                   g_interface_info: CalendarServerInfo,
-				   g_name: 'org.gnome.Shell.CalendarServer',
+                                   g_name: 'org.gnome.Shell.CalendarServer',
-				   g_object_path: '/org/gnome/Shell/CalendarServer',
+                                   g_object_path: '/org/gnome/Shell/CalendarServer',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
+                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
-                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
 
     self.init(null);
     return self;
 }
 
-// an implementation that reads data from a session bus service
-function DBusEventSource() {
-    this._init();
-}
-
 function _datesEqual(a, b) {
     if (a < b)
         return false;
@@ -242,8 +222,10 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
         return true;
 }
 
+// an implementation that reads data from a session bus service
+const DBusEventSource = new Lang.Class({
+    Name: 'DBusEventSource',
 
-DBusEventSource.prototype = {
     _init: function() {
         this._resetCache();
 
@@ -278,8 +260,9 @@ DBusEventSource.prototype = {
         this._loadEvents(false);
     },
 
-    _onEventsReceived: function([appointments]) {
+    _onEventsReceived: function(results, error) {
         let newEvents = [];
+        let appointments = results ? results[0] : null;
         if (appointments != null) {
             for (let n = 0; n < appointments.length; n++) {
                 let a = appointments[n];
@@ -344,30 +327,14 @@ DBusEventSource.prototype = {
 
         return true;
     }
-};
+});
 Signals.addSignalMethods(DBusEventSource.prototype);
 
-// Calendar:
+const Calendar = new Lang.Class({
-// @eventSource: is an object implementing the EventSource API, e.g. the
+    Name: 'Calendar',
-// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
-function Calendar(eventSource) {
-    this._init(eventSource);
-}
-
-Calendar.prototype = {
-    _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;
         this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
 
         this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
@@ -401,6 +368,24 @@ Calendar.prototype = {
         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)) {
@@ -415,15 +400,13 @@ Calendar.prototype = {
 
     _buildHeader: function() {
         let offsetCols = this._useWeekdate ? 1 : 0;
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         // Top line of the calendar '<| September 2009 |>'
         this._topBox = new St.BoxLayout();
         this.actor.add(this._topBox,
                        { row: 0, col: 0, col_span: offsetCols + 7 });
 
-        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
-
         let back = new St.Button({ style_class: 'calendar-change-month-back' });
         this._topBox.add(back);
         back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
@@ -457,19 +440,7 @@ Calendar.prototype = {
         }
 
         // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_children().length;
+        this._firstDayIndex = this.actor.get_n_children();
-    },
-
-    _onStyleChange: function(actor, event) {
-        // width of a digit in pango units
-        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
-        this._setWeekdateHeaderWidth();
-    },
-
-    _setWeekdateHeaderWidth: function() {
-        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
-            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
-        }
     },
 
     _onScroll : function(actor, event) {
@@ -560,6 +531,7 @@ Calendar.prototype = {
         let row = 2;
         while (true) {
             let button = new St.Button({ label: iter.getDate().toString() });
+            let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;
 
             if (!this._eventSource)
                 button.reactive = false;
@@ -580,7 +552,10 @@ Calendar.prototype = {
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
                 styleClass = 'calendar-day-top ' + styleClass;
-            if (iter.getDay() == this._weekStart)
+
+            let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
+                               : iter.getDay() == this._weekStart;
+            if (leftMost)
                 styleClass = 'calendar-day-left ' + styleClass;
 
             if (_sameDay(now, iter))
@@ -620,25 +595,32 @@ Calendar.prototype = {
         if (this._eventSource)
             this._eventSource.requestRange(beginDate, iter, forceReload);
     }
-};
+});
 
 Signals.addSignalMethods(Calendar.prototype);
 
-function EventsList(eventSource) {
+const EventsList = new Lang.Class({
-    this._init(eventSource);
+    Name: 'EventsList',
-}
 
-EventsList.prototype = {
+    _init: function() {
-    _init: function(eventSource) {
         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) {
@@ -696,7 +678,7 @@ EventsList.prototype = {
     },
 
     _showOtherDay: function(day) {
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
@@ -713,7 +695,7 @@ EventsList.prototype = {
     },
 
     _showToday: function() {
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         let now = new Date();
         let dayBegin = _getBeginningOfDay(now);
@@ -724,13 +706,15 @@ EventsList.prototype = {
         let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
         this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
 
-        if (dayEnd.getDay() <= 4 + this._weekStart) {
+        let dayInWeek = (dayEnd.getDay() - this._weekStart + 7) % 7;
+
+        if (dayInWeek < 5) {
             /* If now is within the first 5 days we show "This week" and
              * include events up until and including Saturday/Sunday
              * (depending on whether a week starts on Sunday/Monday).
              */
             let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let thisWeekEnd = new Date(dayEnd.getTime() + (6 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayInWeek) * 86400 * 1000);
             this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
         } else {
             /* otherwise it's one of the two last days of the week ... show
@@ -738,7 +722,7 @@ EventsList.prototype = {
              * Saturday/Sunday
              */
             let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let nextWeekEnd = new Date(dayEnd.getTime() + (13 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayInWeek) * 86400 * 1000);
             this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
         }
     },
@@ -759,4 +743,4 @@ EventsList.prototype = {
             this._showOtherDay(this._date);
         }
     }
-};
+});

js/ui/checkBox.js

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

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

@@ -0,0 +1,241 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Params = imports.misc.params;
+const Shell = imports.gi.Shell;
+
+const GnomeSession = imports.misc.gnomeSession;
+const LoginManager = imports.misc.loginManager;
+const Main = imports.ui.main;
+const ShellMountOperation = imports.ui.shellMountOperation;
+
+const GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
+
+// GSettings keys
+const SETTINGS_SCHEMA = 'org.gnome.desktop.media-handling';
+const SETTING_ENABLE_AUTOMOUNT = 'automount';
+
+const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
+
+const AutomountManager = new Lang.Class({
+    Name: 'AutomountManager',
+
+    _init: function() {
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
+        this._volumeQueue = [];
+        this._session = new GnomeSession.SessionManager();
+        this._session.connectSignal('InhibitorAdded',
+                                    Lang.bind(this, this._InhibitorsChanged));
+        this._session.connectSignal('InhibitorRemoved',
+                                    Lang.bind(this, this._InhibitorsChanged));
+        this._inhibited = false;
+
+        this._loginManager = LoginManager.getLoginManager();
+        this._volumeMonitor = Gio.VolumeMonitor.get();
+    },
+
+    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));
+
+        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]) {
+        this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
+            Lang.bind(this,
+                function(result, error) {
+                    if (!error) {
+                        this._inhibited = result[0];
+                    }
+                }));
+    },
+
+    _startupMountAll: function() {
+        let volumes = this._volumeMonitor.get_volumes();
+        volumes.forEach(Lang.bind(this, function(volume) {
+            this._checkAndMountVolume(volume, { checkSession: false,
+                                                useMountOp: false,
+                                                allowAutorun: false });
+        }));
+
+        this._mountAllId = 0;
+        return false;
+    },
+
+    _onDriveConnected: function() {
+        // if we're not in the current ConsoleKit session,
+        // or screensaver is active, don't play sounds
+        if (!this._loginManager.sessionActive)
+            return;
+
+        global.play_theme_sound(0, 'device-added-media');
+    },
+
+    _onDriveDisconnected: function() {
+        // if we're not in the current ConsoleKit session,
+        // or screensaver is active, don't play sounds
+        if (!this._loginManager.sessionActive)
+            return;
+
+        global.play_theme_sound(0, 'device-removed-media');        
+    },
+
+    _onDriveEjectButton: function(monitor, drive) {
+        // TODO: this code path is not tested, as the GVfs volume monitor
+        // doesn't emit this signal just yet.
+        if (!this._loginManager.sessionActive)
+            return;
+
+        // we force stop/eject in this case, so we don't have to pass a
+        // mount operation object
+        if (drive.can_stop()) {
+            drive.stop
+                (Gio.MountUnmountFlags.FORCE, null, null,
+                 Lang.bind(this, function(drive, res) {
+                     try {
+                         drive.stop_finish(res);
+                     } catch (e) {
+                         log("Unable to stop the drive after drive-eject-button " + e.toString());
+                     }
+                 }));
+        } else if (drive.can_eject()) {
+            drive.eject_with_operation 
+                (Gio.MountUnmountFlags.FORCE, null, null,
+                 Lang.bind(this, function(drive, res) {
+                     try {
+                         drive.eject_with_operation_finish(res);
+                     } catch (e) {
+                         log("Unable to eject the drive after drive-eject-button " + e.toString());
+                     }
+                 }));
+        }
+    },
+
+    _onVolumeAdded: function(monitor, volume) {
+        this._checkAndMountVolume(volume);
+    },
+
+    _checkAndMountVolume: function(volume, params) {
+        params = Params.parse(params, { checkSession: true,
+                                        useMountOp: true,
+                                        allowAutorun: true });
+
+        if (params.checkSession) {
+            // if we're not in the current ConsoleKit session,
+            // don't attempt automount
+            if (!this._loginManager.sessionActive)
+                return;
+        }
+
+        if (this._inhibited)
+            return;
+
+        // Volume is already mounted, don't bother.
+        if (volume.get_mount())
+            return;
+
+        if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
+            !volume.should_automount() ||
+            !volume.can_mount()) {
+            // allow the autorun to run anyway; this can happen if the
+            // mount gets added programmatically later, even if 
+            // should_automount() or can_mount() are false, like for
+            // blank optical media.
+            this._allowAutorun(volume);
+            this._allowAutorunExpire(volume);
+
+            return;
+        }
+
+        if (params.useMountOp) {
+            let operation = new ShellMountOperation.ShellMountOperation(volume);
+            this._mountVolume(volume, operation, params.allowAutorun);
+        } else {
+            this._mountVolume(volume, null, params.allowAutorun);
+        }
+    },
+
+    _mountVolume: function(volume, operation, allowAutorun) {
+        if (allowAutorun)
+            this._allowAutorun(volume);
+
+        let mountOp = operation ? operation.mountOp : null;
+        volume._operation = operation;
+
+        volume.mount(0, mountOp, null,
+                     Lang.bind(this, this._onVolumeMounted));
+    },
+
+    _onVolumeMounted: function(volume, res) {
+        this._allowAutorunExpire(volume);
+
+        try {
+            volume.mount_finish(res);
+            this._closeOperation(volume);
+        } catch (e) {
+            // FIXME: we will always get G_IO_ERROR_FAILED from the gvfs udisks
+            // backend in this case, see 
+            // https://bugs.freedesktop.org/show_bug.cgi?id=51271
+            if (e.message.indexOf('No key available with this passphrase') != -1) {
+                this._reaskPassword(volume);
+            } else {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+
+                this._closeOperation(volume);
+            }
+        }
+    },
+
+    _onVolumeRemoved: function(monitor, volume) {
+        this._volumeQueue = 
+            this._volumeQueue.filter(function(element) {
+                return (element != volume);
+            });
+    },
+
+    _reaskPassword: function(volume) {
+        let existingDialog = volume._operation ? volume._operation.borrowDialog() : null;
+        let operation = 
+            new ShellMountOperation.ShellMountOperation(volume,
+                                                        { existingDialog: existingDialog });
+        this._mountVolume(volume, operation);
+    },
+
+    _closeOperation: function(volume) {
+        if (volume._operation)
+            volume._operation.close();
+    },
+
+    _allowAutorun: function(volume) {
+        volume.allowAutorun = true;
+    },
+
+    _allowAutorunExpire: function(volume) {
+        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
+            volume.allowAutorun = false;
+            return false;
+        });
+    }
+});
+const Component = AutomountManager;

js/ui/components/autorunManager.js

@@ -4,6 +4,7 @@ const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
+const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ShellMountOperation = imports.ui.shellMountOperation;
@@ -23,12 +24,14 @@ const AutorunSetting = {
 };
 
 // misc utils
-function ignoreAutorunForMount(mount) {
+function shouldAutorunMount(mount, forTransient) {
     let root = mount.get_root();
     let volume = mount.get_volume();
 
-    if ((root.is_native() && !isMountRootHidden(root)) ||
+    if (!volume || (!volume.allowAutorun && forTransient))
-        (volume && volume.allowAutorun && volume.should_automount()))
+        return false;
+
+    if (!root.is_native() || isMountRootHidden(root))
         return false;
 
     return true;
@@ -41,6 +44,17 @@ function isMountRootHidden(root) {
     return (path.indexOf('/.') != -1);
 }
 
+function isMountNonLocal(mount) {
+    // If the mount doesn't have an associated volume, that means it's
+    // an uninteresting filesystem. Most devices that we care about will
+    // have a mount, like media players and USB sticks.
+    let volume = mount.get_volume();
+    if (volume == null)
+        return true;
+
+    return (volume.get_identifier("class") == "network");
+}
+
 function startAppForMount(app, mount) {
     let files = [];
     let root = mount.get_root();
@@ -75,20 +89,26 @@ function HotplugSniffer() {
                                    '/org/gnome/Shell/HotplugSniffer');
 }
 
-function ContentTypeDiscoverer(callback) {
+const ContentTypeDiscoverer = new Lang.Class({
-    this._init(callback);
+    Name: 'ContentTypeDiscoverer',
-}
 
-ContentTypeDiscoverer.prototype = {
     _init: function(callback) {
         this._callback = callback;
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
 
     guessContentTypes: function(mount) {
-        // guess mount's content types using GIO
+        let autorunEnabled = !this._settings.get_boolean(SETTING_DISABLE_AUTORUN);
-        mount.guess_content_type(false, null,
+        let shouldScan = autorunEnabled && !isMountNonLocal(mount);
-                                 Lang.bind(this,
+
-                                           this._onContentTypeGuessed));
+        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) {
@@ -136,63 +156,75 @@ ContentTypeDiscoverer.prototype = {
 
         this._callback(mount, apps, contentTypes);
     }
-}
+});
 
-function AutorunManager() {
+const AutorunManager = new Lang.Class({
-    this._init();
+    Name: 'AutorunManager',
-}
 
-AutorunManager.prototype = {
     _init: function() {
+        this._loginManager = LoginManager.getLoginManager();
+
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
-        this._volumeMonitor.connect('mount-added',
+        this._transDispatcher = new AutorunTransientDispatcher(this);
-                                    Lang.bind(this,
+    },
-                                              this._onMountAdded));
-        this._volumeMonitor.connect('mount-removed',
-                                    Lang.bind(this,
-                                              this._onMountRemoved));
 
-        this._transDispatcher = new AutorunTransientDispatcher();
+    _ensureResidentSource: function() {
-        this._createResidentSource();
+        if (this._residentSource)
+            return;
 
-        let mounts = this._volumeMonitor.get_mounts();
+        this._residentSource = new AutorunResidentSource(this);
-
+        let destroyId = this._residentSource.connect('destroy', Lang.bind(this, function() {
-        mounts.forEach(Lang.bind(this, function (mount) {
+            this._residentSource.disconnect(destroyId);
-            let discoverer = new ContentTypeDiscoverer(Lang.bind (this, 
+            this._residentSource = null;
-                function (mount, apps) {
-                    this._residentSource.addMount(mount, apps);
-                }));
-
-            discoverer.guessContentTypes(mount);
         }));
     },
 
-    _createResidentSource: function() {
+    enable: function() {
-        this._residentSource = new AutorunResidentSource();
+        this._scanMounts();
-        this._residentSource.connect('destroy',
+
-                                     Lang.bind(this,
+        this._mountAddedId = this._volumeMonitor.connect('mount-added', Lang.bind(this, this._onMountAdded));
-                                               this._createResidentSource));
+        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) {
         // don't do anything if our session is not the currently
         // active one
-        if (!Main.automountManager.ckListener.sessionActive)
+        if (!this._loginManager.sessionActive)
             return;
 
-        let discoverer = new ContentTypeDiscoverer(Lang.bind (this,
+        this._processMount(mount, true);
-            function (mount, apps, contentTypes) {
-                this._transDispatcher.addMount(mount, apps, contentTypes);
-                this._residentSource.addMount(mount, apps);
-            }));
-
-        discoverer.guessContentTypes(mount);
     },
 
     _onMountRemoved: function(monitor, mount) {
         this._transDispatcher.removeMount(mount);
-        this._residentSource.removeMount(mount);
+        if (this._residentSource)
+            this._residentSource.removeMount(mount);
     },
 
     ejectMount: function(mount) {
@@ -228,11 +260,9 @@ AutorunManager.prototype = {
         try {
             mount.unmount_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-            // but we can't access the error code from JS.
+                log('Unable to eject the mount ' + mount.get_name() 
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+                    + ': ' + e.toString());
-            log('Unable to eject the mount ' + mount.get_name() 
-                + ': ' + e.toString());
         }
     },
 
@@ -240,11 +270,9 @@ AutorunManager.prototype = {
         try {
             source.eject_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-            // but we can't access the error code from JS.
+                log('Unable to eject the drive ' + source.get_name()
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+                    + ': ' + e.toString());
-            log('Unable to eject the drive ' + source.get_name() 
-                + ': ' + e.toString());
         }
     },
 
@@ -252,33 +280,33 @@ AutorunManager.prototype = {
         try {
             drive.stop_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-            // but we can't access the error code from JS.
+                log('Unable to stop the drive ' + drive.get_name() 
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+                    + ': ' + e.toString());
-            log('Unable to stop the drive ' + drive.get_name() 
-                + ': ' + e.toString());
         }
     },
-}
+});
 
-function AutorunResidentSource() {
+const AutorunResidentSource = new Lang.Class({
-    this._init();
+    Name: 'AutorunResidentSource',
-}
+    Extends: MessageTray.Source,
 
-AutorunResidentSource.prototype = {
+    _init: function(manager) {
-    __proto__: MessageTray.Source.prototype,
+        this.parent(_("Removable Devices"), 'media-removable');
-
+        this.showInLockScreen = false;
-    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Removable Devices"));
 
         this._mounts = [];
 
-        this._notification = new AutorunResidentNotification(this);
+        this._manager = manager;
-        this._setSummaryIcon(this.createNotificationIcon());
+        this._notification = new AutorunResidentNotification(this._manager, this);
+    },
+
+    buildRightClickMenu: function() {
+        return null;
     },
 
     addMount: function(mount, apps) {
-        if (ignoreAutorunForMount(mount))
+        if (!shouldAutorunMount(mount, false))
             return;
 
         let filtered = this._mounts.filter(function (element) {
@@ -317,32 +345,22 @@ AutorunResidentSource.prototype = {
             Main.messageTray.add(this);
             this.pushNotification(this._notification);
         }
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon ({ icon_name: 'media-removable',
-                              icon_type: St.IconType.FULLCOLOR,
-                              icon_size: this.ICON_SIZE });
     }
-}
+});
 
-function AutorunResidentNotification(source) {
+const AutorunResidentNotification = new Lang.Class({
-    this._init(source);
+    Name: 'AutorunResidentNotification',
-}
+    Extends: MessageTray.Notification,
 
-AutorunResidentNotification.prototype = {
+    _init: function(manager, source) {
-    __proto__: MessageTray.Notification.prototype,
+        this.parent(source, source.title, null, { customContent: true });
-
-    _init: function(source) {
-        MessageTray.Notification.prototype._init.call(this, source,
-                                                      source.title, null,
-                                                      { customContent: true });
 
         // set the notification as resident
         this.setResident(true);
 
         this._layout = new St.BoxLayout ({ style_class: 'hotplug-resident-box',
                                            vertical: true });
+        this._manager = manager;
 
         this.addActor(this._layout,
                       { x_expand: true,
@@ -351,7 +369,7 @@ AutorunResidentNotification.prototype = {
 
     updateForMounts: function(mounts) {
         // remove all the layout content
-        this._layout.destroy_children();
+        this._layout.destroy_all_children();
 
         for (let idx = 0; idx < mounts.length; idx++) {
             let element = mounts[idx];
@@ -390,7 +408,7 @@ AutorunResidentNotification.prototype = {
                                 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 =
@@ -405,19 +423,18 @@ AutorunResidentNotification.prototype = {
         }));
 
         ejectButton.connect('clicked', Lang.bind(this, function() {
-            Main.autorunManager.ejectMount(mount);
+            this._manager.ejectMount(mount);
         }));
 
         return item;
     },
-}
+});
 
-function AutorunTransientDispatcher() {
+const AutorunTransientDispatcher = new Lang.Class({
-    this._init();
+    Name: 'AutorunTransientDispatcher',
-}
 
-AutorunTransientDispatcher.prototype = {
+    _init: function(manager) {
-    _init: function() {
+        this._manager = manager;
         this._sources = [];
         this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
@@ -460,7 +477,7 @@ AutorunTransientDispatcher.prototype = {
             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) {
@@ -469,7 +486,7 @@ AutorunTransientDispatcher.prototype = {
             return;
 
         // if the mount doesn't want to be autorun, return
-        if (ignoreAutorunForMount(mount))
+        if (!shouldAutorunMount(mount, true))
             return;
 
         let setting = this._getAutorunSettingForType(contentTypes[0]);
@@ -507,47 +524,39 @@ AutorunTransientDispatcher.prototype = {
         // destroy the notification source
         source.destroy();
     }
-}
+});
 
-function AutorunTransientSource(mount, apps) {
+const AutorunTransientSource = new Lang.Class({
-    this._init(mount, apps);
+    Name: 'AutorunTransientSource',
-}
+    Extends: MessageTray.Source,
-
-AutorunTransientSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
-
-    _init: function(mount, apps) {
-        MessageTray.Source.prototype._init.call(this, mount.get_name());
 
+    _init: function(manager, mount, apps) {
+        this._manager = manager;
         this.mount = mount;
         this.apps = apps;
 
-        this._notification = new AutorunTransientNotification(this);
+        this.parent(mount.get_name());
-        this._setSummaryIcon(this.createNotificationIcon());
+
+        this._notification = new AutorunTransientNotification(this._manager, this);
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
         this.notify(this._notification);
     },
 
-    createNotificationIcon: function() {
+    getIcon: function() {
-        return new St.Icon({ gicon: this.mount.get_icon(),
+        return this.mount.get_icon();
-                             icon_size: this.ICON_SIZE });
     }
-}
+});
 
-function AutorunTransientNotification(source) {
+const AutorunTransientNotification = new Lang.Class({
-    this._init(source);
+    Name: 'AutorunTransientNotification',
-}
+    Extends: MessageTray.Notification,
 
-AutorunTransientNotification.prototype = {
+    _init: function(manager, source) {
-    __proto__: MessageTray.Notification.prototype,
+        this.parent(source, source.title, null, { customContent: true });
-
-    _init: function(source) {
-        MessageTray.Notification.prototype._init.call(this, 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);
@@ -579,7 +588,7 @@ AutorunTransientNotification.prototype = {
 
         let label = new St.Bin({ y_align: St.Align.MIDDLE,
                                  child: new St.Label
-                                 ({ text: _("Open with %s").format(app.get_display_name()) })
+                                 ({ text: _("Open with %s").format(app.get_name()) })
                                });
         box.add(label);
 
@@ -599,7 +608,7 @@ AutorunTransientNotification.prototype = {
 
     _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);
 
@@ -616,10 +625,11 @@ AutorunTransientNotification.prototype = {
                                      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

@@ -0,0 +1,227 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Pango = imports.gi.Pango;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Gcr = imports.gi.Gcr;
+
+const ModalDialog = imports.ui.modalDialog;
+const ShellEntry = imports.ui.shellEntry;
+const CheckBox = imports.ui.checkBox;
+
+let prompter = null;
+
+const KeyringDialog = new Lang.Class({
+    Name: 'KeyringDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function() {
+        this.parent({ styleClass: 'prompt-dialog' });
+
+        this.prompt = new Shell.KeyringPrompt();
+        this.prompt.connect('show-password', Lang.bind(this, this._onShowPassword));
+        this.prompt.connect('show-confirm', Lang.bind(this, this._onShowConfirm));
+        this.prompt.connect('hide-prompt', Lang.bind(this, this._onHidePrompt));
+
+        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
+                                                vertical: false });
+        this.contentLayout.add(mainContentBox);
+
+        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
+        mainContentBox.add(icon,
+                           { x_fill:  true,
+                             y_fill:  false,
+                             x_align: St.Align.END,
+                             y_align: St.Align.START });
+
+        this._messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
+                                              vertical: true });
+        mainContentBox.add(this._messageBox,
+                           { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
+
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
+        this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
+
+        this._messageBox.add(subject,
+                             { y_fill:  false,
+                               y_align: St.Align.START });
+
+        let description = new St.Label({ style_class: 'prompt-dialog-description' });
+        description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        description.clutter_text.line_wrap = true;
+        this.prompt.bind_property('description', description, 'text', GObject.BindingFlags.SYNC_CREATE);
+        this._messageBox.add(description,
+                            { y_fill:  true,
+                              y_align: St.Align.START });
+
+        this._controlTable = null;
+
+        let buttons = [{ label: '',
+                         action: Lang.bind(this, this._onCancelButton),
+                         key:    Clutter.Escape
+                       },
+                       { label: '',
+                         action: Lang.bind(this, this._onContinueButton),
+                         default: true
+                       }]
+
+        this.setButtons(buttons);
+        this._cancelButton = buttons[0].button;
+        this._continueButton = buttons[1].button;
+
+        this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
+        this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
+    },
+
+    _buildControlTable: function() {
+        let table = new St.Table({ style_class: 'keyring-dialog-control-table' });
+        let row = 0;
+
+        if (this.prompt.password_visible) {
+            let label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
+            label.set_text(_("Password:"));
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
+            this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
+                                                 text: '',
+                                                 can_focus: true});
+            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+            ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
+            this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
+            table.add(this._passwordEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
+            row++;
+        } else {
+            this._passwordEntry = null;
+        }
+
+        if (this.prompt.confirm_visible) {
+            var label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
+            label.set_text(_("Type again:"));
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
+            this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
+                                                text: '',
+                                                can_focus: true});
+            this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+            ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true });
+            this._confirmEntry.clutter_text.connect('activate', Lang.bind(this, this._onConfirmActivate));
+            table.add(this._confirmEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
+            row++;
+        } else {
+            this._confirmEntry = null;
+        }
+
+        this.prompt.set_password_actor(this._passwordEntry ? this._passwordEntry.clutter_text : null);
+        this.prompt.set_confirm_actor(this._confirmEntry ? this._confirmEntry.clutter_text : null);
+
+        if (this.prompt.choice_visible) {
+            let choice = new CheckBox.CheckBox();
+            this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
+            this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
+            table.add(choice.actor, { row: row, col: 1, x_expand: false, x_fill: true, x_align: St.Align.START });
+            row++;
+        }
+
+        let warning = new St.Label({ style_class: 'prompt-dialog-error-label' });
+        warning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        warning.clutter_text.line_wrap = true;
+        table.add(warning, { row: row, col: 1, x_expand: false, x_fill: false, x_align: St.Align.START });
+        this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
+        this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);
+
+        if (this._controlTable) {
+            this._controlTable.destroy_all_children();
+            this._controlTable.destroy();
+        }
+
+        this._controlTable = table;
+        this._messageBox.add(table, { x_fill: true, y_fill: true });
+    },
+
+    _ensureOpen: function() {
+        // NOTE: ModalDialog.open() is safe to call if the dialog is
+        // already open - it just returns true without side-effects
+        if (this.open())
+          return true;
+
+        // The above fail if e.g. unable to get input grab
+        //
+        // In an ideal world this wouldn't happen (because the
+        // Shell is in complete control of the session) but that's
+        // just not how things work right now.
+
+        log('keyringPrompt: Failed to show modal dialog.' +
+            ' Dismissing prompt request');
+        this.prompt.cancel()
+        return false;
+    },
+
+    _onShowPassword: function(prompt) {
+        this._buildControlTable();
+        this._ensureOpen();
+        this._passwordEntry.grab_key_focus();
+    },
+
+    _onShowConfirm: function(prompt) {
+        this._buildControlTable();
+        this._ensureOpen();
+        this._continueButton.grab_key_focus();
+    },
+
+    _onHidePrompt: function(prompt) {
+        this.close();
+    },
+
+    _onPasswordActivate: function() {
+        if (this.prompt.confirm_visible)
+            this._confirmEntry.grab_key_focus();
+        else
+            this._onContinueButton();
+    },
+
+    _onConfirmActivate: function() {
+        this._onContinueButton();
+    },
+
+    _onContinueButton: function() {
+        this.prompt.complete();
+    },
+
+    _onCancelButton: function() {
+        this.prompt.cancel();
+    },
+});
+
+const KeyringPrompter = new Lang.Class({
+    Name: 'KeyringPrompter',
+
+    _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

@@ -0,0 +1,709 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Lang = imports.lang;
+const NetworkManager = imports.gi.NetworkManager;
+const NMClient = imports.gi.NMClient;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Config = imports.misc.config;
+const ModalDialog = imports.ui.modalDialog;
+const PopupMenu = imports.ui.popupMenu;
+const ShellEntry = imports.ui.shellEntry;
+
+const VPN_UI_GROUP = 'VPN Plugin UI';
+
+const NetworkSecretDialog = new Lang.Class({
+    Name: 'NetworkSecretDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(agent, requestId, connection, settingName, hints, contentOverride) {
+        this.parent({ styleClass: 'prompt-dialog' });
+
+        this._agent = agent;
+        this._requestId = requestId;
+        this._connection = connection;
+        this._settingName = settingName;
+        this._hints = hints;
+
+        if (contentOverride)
+            this._content = contentOverride;
+        else
+            this._content = this._getContent();
+
+        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
+                                                vertical: false });
+        this.contentLayout.add(mainContentBox,
+                               { x_fill: true,
+                                 y_fill: true });
+
+        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
+        mainContentBox.add(icon,
+                           { x_fill:  true,
+                             y_fill:  false,
+                             x_align: St.Align.END,
+                             y_align: St.Align.START });
+
+        let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
+                                            vertical: true });
+        mainContentBox.add(messageBox,
+                           { y_align: St.Align.START });
+
+        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
+                                            text: this._content.title });
+        messageBox.add(subjectLabel,
+                       { y_fill:  false,
+                         y_align: St.Align.START });
+
+        if (this._content.message != null) {
+            let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
+                                                  text: this._content.message,
+                                                  // HACK: for reasons unknown to me, the label
+                                                  // is not asked the correct height for width,
+                                                  // and thus is underallocated
+                                                  // place a fixed height to avoid overflowing
+                                                  style: 'height: 3em'
+                                                });
+            descriptionLabel.clutter_text.line_wrap = true;
+
+            messageBox.add(descriptionLabel,
+                           { y_fill:  true,
+                             y_align: St.Align.START,
+                             expand: true });
+        }
+
+        let secretTable = new St.Table({ style_class: 'network-dialog-secret-table' });
+        let initialFocusSet = false;
+        let pos = 0;
+        for (let i = 0; i < this._content.secrets.length; i++) {
+            let secret = this._content.secrets[i];
+            let label = new St.Label({ style_class: 'prompt-dialog-password-label',
+                                       text: secret.label });
+
+            let reactive = secret.key != null;
+
+            secret.entry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
+                                          text: secret.value, can_focus: reactive,
+                                          reactive: reactive });
+            ShellEntry.addContextMenu(secret.entry,
+                                      { isPassword: secret.password });
+
+            if (secret.validate)
+                secret.valid = secret.validate(secret);
+            else // no special validation, just ensure it's not empty
+                secret.valid = secret.value.length > 0;
+
+            if (reactive) {
+                if (!initialFocusSet) {
+                    this.setInitialKeyFocus(secret.entry);
+                    initialFocusSet = true;
+                }
+
+                secret.entry.clutter_text.connect('activate', Lang.bind(this, this._onOk));
+                secret.entry.clutter_text.connect('text-changed', Lang.bind(this, function() {
+                    secret.value = secret.entry.get_text();
+                    if (secret.validate)
+                        secret.valid = secret.validate(secret);
+                    else
+                        secret.valid = secret.value.length > 0;
+                    this._updateOkButton();
+                }));
+            } else
+                secret.valid = true;
+
+            secretTable.add(label, { row: pos, col: 0,
+                                     x_expand: false, x_fill: true,
+                                     x_align: St.Align.START,
+                                     y_fill: false, y_align: St.Align.MIDDLE });
+            secretTable.add(secret.entry, { row: pos, col: 1, x_expand: true, x_fill: true, y_align: St.Align.END });
+            pos++;
+
+            if (secret.password)
+                secret.entry.clutter_text.set_password_char('\u25cf');
+        }
+
+        messageBox.add(secretTable);
+
+        this._okButton = { label:  _("Connect"),
+                           action: Lang.bind(this, this._onOk),
+                           default: true
+                         };
+
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this.cancel),
+                           key:    Clutter.KEY_Escape,
+                         },
+                         this._okButton]);
+    },
+
+    _updateOkButton: function() {
+        let valid = true;
+        for (let i = 0; i < this._content.secrets.length; i++) {
+            let secret = this._content.secrets[i];
+            valid = valid && secret.valid;
+        }
+
+        this._okButton.button.reactive = valid;
+        this._okButton.button.can_focus = valid;
+    },
+
+    _onOk: function() {
+        let valid = true;
+        for (let i = 0; i < this._content.secrets.length; i++) {
+            let secret = this._content.secrets[i];
+            valid = valid && secret.valid;
+            if (secret.key != null)
+                this._agent.set_password(this._requestId, secret.key, secret.value);
+        }
+
+        if (valid) {
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
+            this.close(global.get_current_time());
+        }
+        // do nothing if not valid
+    },
+
+    cancel: function() {
+        this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
+        this.close(global.get_current_time());
+    },
+
+    _validateWpaPsk: function(secret) {
+        let value = secret.value;
+        if (value.length == 64) {
+            // must be composed of hexadecimal digits only
+            for (let i = 0; i < 64; i++) {
+                if (!((value[i] >= 'a' && value[i] <= 'f')
+                      || (value[i] >= 'A' && value[i] <= 'F')
+                      || (value[i] >= '0' && value[i] <= '9')))
+                    return false;
+            }
+            return true;
+        }
+
+        return (value.length >= 8 && value.length <= 63);
+    },
+
+    _validateStaticWep: function(secret) {
+        let value = secret.value;
+        if (secret.wep_key_type == NetworkManager.WepKeyType.KEY) {
+            if (value.length == 10 || value.length == 26) {
+		for (let i = 0; i < value.length; i++) {
+                    if (!((value[i] >= 'a' && value[i] <= 'f')
+                          || (value[i] >= 'A' && value[i] <= 'F')
+                          || (value[i] >= '0' && value[i] <= '9')))
+                        return false;
+		}
+	    } else if (value.length == 5 || value.length == 13) {
+		for (let i = 0; i < value.length; i++) {
+                    if (!((value[i] >= 'a' && value[i] <= 'z')
+                          || (value[i] >= 'A' && value[i] <= 'Z')))
+                        return false;
+                }
+            } else
+                return false;
+	} else if (secret.wep_key_type == NetworkManager.WepKeyType.PASSPHRASE) {
+	    if (value.length < 0 || value.length > 64)
+	        return false;
+	}
+        return true;
+    },
+
+    _getWirelessSecrets: function(secrets, wirelessSetting) {
+        let wirelessSecuritySetting = this._connection.get_setting_wireless_security();
+        switch (wirelessSecuritySetting.key_mgmt) {
+        // First the easy ones
+        case 'wpa-none':
+        case 'wpa-psk':
+            secrets.push({ label: _("Password: "), key: 'psk',
+                           value: wirelessSecuritySetting.psk || '',
+                           validate: this._validateWpaPsk, password: true });
+            break;
+        case 'none': // static WEP
+            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
+                           value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
+                           wep_key_type: wirelessSecuritySetting.wep_key_type,
+                           validate: this._validateStaticWep, password: true });
+            break;
+        case 'ieee8021x':
+            if (wirelessSecuritySetting.auth_alg == 'leap') // Cisco LEAP
+                secrets.push({ label: _("Password: "), key: 'leap-password',
+                               value: wirelessSecuritySetting.leap_password || '', password: true });
+            else // Dynamic (IEEE 802.1x) WEP
+                this._get8021xSecrets(secrets);
+            break;
+        case 'wpa-eap':
+            this._get8021xSecrets(secrets);
+            break;
+        default:
+            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
+        }
+    },
+
+    _get8021xSecrets: function(secrets) {
+        let ieee8021xSetting = this._connection.get_setting_802_1x();
+        let phase2method;
+
+        switch (ieee8021xSetting.get_eap_method(0)) {
+        case 'md5':
+        case 'leap':
+        case 'ttls':
+        case 'peap':
+            // TTLS and PEAP are actually much more complicated, but this complication
+            // is not visible here since we only care about phase2 authentication
+            // (and don't even care of which one)
+            secrets.push({ label: _("Username: "), key: null,
+                           value: ieee8021xSetting.identity || '', password: false });
+            secrets.push({ label: _("Password: "), key: 'password',
+                           value: ieee8021xSetting.password || '', password: true });
+            break;
+        case 'tls':
+            secrets.push({ label: _("Identity: "), key: null,
+                           value: ieee8021xSetting.identity || '', password: false });
+            secrets.push({ label: _("Private key password: "), key: 'private-key-password',
+                           value: ieee8021xSetting.private_key_password || '', password: true });
+            break;
+        default:
+            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
+        }
+    },
+
+    _getPPPoESecrets: function(secrets) {
+        let pppoeSetting = this._connection.get_setting_pppoe();
+        secrets.push({ label: _("Username: "), key: 'username',
+                       value: pppoeSetting.username || '', password: false });
+        secrets.push({ label: _("Service: "), key: 'service',
+                       value: pppoeSetting.service || '', password: false });
+        secrets.push({ label: _("Password: "), key: 'password',
+                       value: pppoeSetting.password || '', password: true });
+    },
+
+    _getMobileSecrets: function(secrets, connectionType) {
+        let setting;
+        if (connectionType == 'bluetooth')
+            setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm();
+        else
+            setting = this._connection.get_setting_by_name(connectionType);
+        secrets.push({ label: _("Password: "), key: 'password',
+                       value: setting.value || '', password: true });
+    },
+
+    _getContent: function() {
+        let connectionSetting = this._connection.get_setting_connection();
+        let connectionType = connectionSetting.get_connection_type();
+        let wirelessSetting;
+        let ssid;
+
+        let content = { };
+        content.secrets = [ ];
+
+        switch (connectionType) {
+        case '802-11-wireless':
+            wirelessSetting = this._connection.get_setting_wireless();
+            ssid = NetworkManager.utils_ssid_to_utf8(wirelessSetting.get_ssid());
+            content.title = _("Authentication required by wireless network");
+            content.message = _("Passwords or encryption keys are required to access the wireless network '%s'.").format(ssid);
+            this._getWirelessSecrets(content.secrets, wirelessSetting);
+            break;
+        case '802-3-ethernet':
+            content.title = _("Wired 802.1X authentication");
+            content.message = null;
+            content.secrets.push({ label: _("Network name: "), key: null,
+                                   value: connectionSetting.get_id(), password: false });
+            this._get8021xSecrets(content.secrets);
+            break;
+        case 'pppoe':
+            content.title = _("DSL authentication");
+            content.message = null;
+            this._getPPPoESecrets(content.secrets);
+            break;
+        case 'gsm':
+            if (this._hints.indexOf('pin') != -1) {
+                let gsmSetting = this._connection.get_setting_gsm();
+                content.title = _("PIN code required");
+                content.message = _("PIN code is needed for the mobile broadband device");
+                content.secrets.push({ label: _("PIN: "), key: 'pin',
+                                       value: gsmSetting.pin || '', password: true });
+            }
+            // fall through
+        case 'cdma':
+        case 'bluetooth':
+            content.title = _("Mobile broadband network password");
+            content.message = _("A password is required to connect to '%s'.").format(connectionSetting.get_id());
+            this._getMobileSecrets(content.secrets, connectionType);
+            break;
+        default:
+            log('Invalid connection type: ' + connectionType);
+        };
+
+        return content;
+    }
+});
+
+const VPNRequestHandler = new Lang.Class({
+    Name: 'VPNRequestHandler',
+
+    _init: function(agent, requestId, authHelper, serviceType, connection, hints, flags) {
+        this._agent = agent;
+        this._requestId = requestId;
+        this._connection = connection;
+        this._pluginOutBuffer = [];
+        this._title = null;
+        this._description = null;
+        this._content = [ ];
+        this._shellDialog = null;
+
+        let connectionSetting = connection.get_setting_connection();
+
+        let argv = [ authHelper.fileName,
+                     '-u', connectionSetting.uuid,
+                     '-n', connectionSetting.id,
+                     '-s', serviceType
+                   ];
+        if (authHelper.externalUIMode)
+            argv.push('--external-ui-mode');
+        if (flags & NMClient.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
+            argv.push('-i');
+        if (flags & NMClient.SecretAgentGetSecretsFlags.REQUEST_NEW)
+            argv.push('-r');
+
+        this._newStylePlugin = authHelper.externalUIMode;
+
+        try {
+            let [success, pid, stdin, stdout, stderr] =
+                GLib.spawn_async_with_pipes(null, /* pwd */
+                                            argv,
+                                            null, /* envp */
+                                            GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                            null /* child_setup */);
+
+            this._childPid = pid;
+            this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
+            this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
+            // We need this one too, even if don't actually care of what the process
+            // has to say on stderr, because otherwise the fd opened by g_spawn_async_with_pipes
+            // is kept open indefinitely
+            let stderrStream = new Gio.UnixInputStream({ fd: stderr, close_fd: true });
+            stderrStream.close(null);
+            this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
+
+            if (this._newStylePlugin)
+                this._readStdoutNewStyle();
+            else
+                this._readStdoutOldStyle();
+
+            this._childWatch = GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid,
+                                                    Lang.bind(this, this._vpnChildFinished));
+
+            this._writeConnection();
+        } catch(e) {
+            logError(e, 'error while spawning VPN auth helper');
+
+            this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+        }
+    },
+
+    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();
+        } else {
+            try {
+                this._stdin.write('QUIT\n\n', null);
+            } catch(e) { /* ignore broken pipe errors */ }
+        }
+
+        this.destroy();
+    },
+
+    destroy: function() {
+        if (this._destroyed)
+            return;
+
+        GLib.source_remove(this._childWatch);
+
+        this._stdin.close(null);
+        // Stdout is closed when we finish reading from it
+
+        this._destroyed = true;
+    },
+
+    _vpnChildFinished: function(pid, status, requestObj) {
+        if (this._newStylePlugin) {
+            // For new style plugin, all work is done in the async reading functions
+            // Just reap the process here
+            return;
+        }
+
+        let [exited, exitStatus] = Shell.util_wifexited(status);
+
+        if (exited) {
+            if (exitStatus != 0)
+                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
+            else
+                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
+        } else
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+
+        this.destroy();
+    },
+
+    _vpnChildProcessLineOldStyle: function(line) {
+        if (this._previousLine != undefined) {
+            // Two consecutive newlines mean that the child should be closed
+            // (the actual newlines are eaten by Gio.DataInputStream)
+            // Send a termination message
+            if (line == '' && this._previousLine == '') {
+                try {
+                    this._stdin.write('QUIT\n\n', null);
+                } catch(e) { /* ignore broken pipe errors */ }
+            } else {
+                this._agent.set_password(this._requestId, this._previousLine, line);
+                this._previousLine = undefined;
+            }
+        } else {
+            this._previousLine = line;
+        }
+    },
+
+    _readStdoutOldStyle: function() {
+        this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(stream, result) {
+            let [line, len] = this._dataStdout.read_line_finish_utf8(result);
+
+            if (line == null) {
+                // end of file
+                this._stdout.close(null);
+                return;
+            }
+
+            this._vpnChildProcessLineOldStyle(line);
+
+            // try to read more!
+            this._readStdoutOldStyle();
+        }));
+    },
+
+    _readStdoutNewStyle: function() {
+        this._dataStdout.fill_async(-1, GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(stream, result) {
+            let cnt = this._dataStdout.fill_finish(result);
+
+            if (cnt == 0) {
+                // end of file
+                this._showNewStyleDialog();
+
+                this._stdout.close(null);
+                return;
+            }
+
+            // Try to read more
+            this._dataStdout.set_buffer_size(2 * this._dataStdout.get_buffer_size());
+            this._readStdoutNewStyle();
+        }));
+    },
+
+    _showNewStyleDialog: function() {
+        let keyfile = new GLib.KeyFile();
+        let contentOverride;
+
+        try {
+            let data = this._dataStdout.peek_buffer();
+            keyfile.load_from_data(data.toString(), data.length,
+                                   GLib.KeyFileFlags.NONE);
+
+            if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2)
+                throw new Error('Invalid plugin keyfile version, is %d');
+
+            contentOverride = { title: keyfile.get_string(VPN_UI_GROUP, 'Title'),
+                                message: keyfile.get_string(VPN_UI_GROUP, 'Description'),
+                                secrets: [] };
+
+            let [groups, len] = keyfile.get_groups();
+            for (let i = 0; i < groups.length; i++) {
+                if (groups[i] == VPN_UI_GROUP)
+                    continue;
+
+                let value = keyfile.get_string(groups[i], 'Value');
+                let shouldAsk = keyfile.get_boolean(groups[i], 'ShouldAsk');
+
+                if (shouldAsk) {
+                    contentOverride.secrets.push({ label: keyfile.get_string(groups[i], 'Label'),
+                                                   key: groups[i],
+                                                   value: value,
+                                                   password: keyfile.get_boolean(groups[i], 'IsSecret')
+                                                 });
+                } else {
+                    if (!value.length) // Ignore empty secrets
+                        continue;
+
+                    this._agent.set_password(this._requestId, groups[i], value);
+                }
+            }
+        } catch(e) {
+            logError(e, 'error while reading VPN plugin output keyfile');
+
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+            return;
+        }
+
+        if (contentOverride.secrets.length) {
+            // Only show the dialog if we actually have something to ask
+            this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], contentOverride);
+            this._shellDialog.open(global.get_current_time());
+        } else {
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
+        }
+    },
+
+    _writeConnection: function() {
+        let vpnSetting = this._connection.get_setting_vpn();
+
+        try {
+            vpnSetting.foreach_data_item(Lang.bind(this, function(key, value) {
+                this._stdin.write('DATA_KEY=' + key + '\n', null);
+                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
+            }));
+            vpnSetting.foreach_secret(Lang.bind(this, function(key, value) {
+                this._stdin.write('SECRET_KEY=' + key + '\n', null);
+                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
+            }));
+            this._stdin.write('DONE\n\n', null);
+        } catch(e) {
+            logError(e, 'internal error while writing connection to helper');
+
+            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+        }
+    },
+});
+
+const NetworkAgent = new Lang.Class({
+    Name: 'NetworkAgent',
+
+    _init: function() {
+        this._native = new Shell.NetworkAgent({ auto_register: false,
+                                                identifier: 'org.gnome.Shell.NetworkAgent' });
+
+        this._dialogs = { };
+        this._vpnRequests = { };
+
+        this._native.connect('new-request', Lang.bind(this, this._newRequest));
+        this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
+    },
+
+    enable: function() {
+        this._native.auto_register = true;
+    },
+
+    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.auto_register = false;
+        if (this._native.registered)
+            this._native.unregister();
+    },
+
+    _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {
+        if (settingName == 'vpn') {
+            this._vpnRequest(requestId, connection, hints, flags);
+            return;
+        }
+
+        let dialog = new NetworkSecretDialog(agent, requestId, connection, settingName, hints);
+        dialog.connect('destroy', Lang.bind(this, function() {
+            delete this._dialogs[requestId];
+        }));
+        this._dialogs[requestId] = dialog;
+        dialog.open(global.get_current_time());
+    },
+
+    _cancelRequest: function(agent, requestId) {
+        if (this._dialogs[requestId]) {
+            this._dialogs[requestId].close(global.get_current_time());
+            this._dialogs[requestId].destroy();
+            delete this._dialogs[requestId];
+        } else if (this._vpnRequests[requestId]) {
+            this._vpnRequests[requestId].cancel(false);
+            delete this._vpnRequests[requestId];
+        }
+    },
+
+    _vpnRequest: function(requestId, connection, hints, flags) {
+        let vpnSetting = connection.get_setting_vpn();
+        let serviceType = vpnSetting.service_type;
+
+        this._buildVPNServiceCache();
+
+        let binary = this._vpnBinaries[serviceType];
+        if (!binary) {
+            log('Invalid VPN service type (cannot find authentication binary)');
+
+            /* cancel the auth process */
+            this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+            return;
+        }
+
+        this._vpnRequests[requestId] = new VPNRequestHandler(this._native, requestId, binary, serviceType, connection, hints, flags);
+    },
+
+    _buildVPNServiceCache: function() {
+        if (this._vpnCacheBuilt)
+            return;
+
+        this._vpnCacheBuilt = true;
+        this._vpnBinaries = { };
+
+        let dir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
+        try {
+            let fileEnum = dir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
+            let info;
+
+            while ((info = fileEnum.next_file(null))) {
+                let name = info.get_name();
+                if (name.substr(-5) != '.name')
+                    continue;
+
+                try {
+                    let keyfile = new GLib.KeyFile();
+                    keyfile.load_from_file(dir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
+                    let service = keyfile.get_string('VPN Connection', 'service');
+                    let binary = keyfile.get_string('GNOME', 'auth-dialog');
+                    let externalUIMode = false;
+                    try {
+                        externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
+                    } catch(e) { } // ignore errors if key does not exist
+                    let path = binary;
+                    if (!GLib.path_is_absolute(path)) {
+                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
+                    }
+
+                    if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
+                        this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };
+                    else
+                        throw new Error('VPN plugin at %s is not executable'.format(path));
+                } catch(e) {
+                    log('Error \'%s\' while processing VPN keyfile \'%s\''.
+                        format(e.message, dir.get_child(name).get_path()));
+                    continue;
+                }
+            }
+        } catch(e) {
+            logError(e, 'error while enumerating VPN auth helpers');
+        }
+    }
+});
+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,18 +13,19 @@ 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;
 
-function AuthenticationDialog(actionId, message, cookie, userNames) {
+const DIALOG_ICON_SIZE = 48;
-    this._init(actionId, message, cookie, userNames);
-}
 
-AuthenticationDialog.prototype = {
+const AuthenticationDialog = new Lang.Class({
-    __proto__: ModalDialog.ModalDialog.prototype,
+    Name: 'AuthenticationDialog',
+    Extends: ModalDialog.ModalDialog,
 
     _init: function(actionId, message, cookie, userNames) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = message;
@@ -52,7 +33,7 @@ AuthenticationDialog.prototype = {
         this._wasDismissed = false;
         this._completed = false;
 
-        let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout',
+        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
                                                 vertical: false });
         this.contentLayout.add(mainContentBox,
                                { x_fill: true,
@@ -65,19 +46,19 @@ AuthenticationDialog.prototype = {
                              x_align: St.Align.END,
                              y_align: St.Align.START });
 
-        let messageBox = new St.BoxLayout({ style_class: 'polkit-dialog-message-layout',
+        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: 'polkit-dialog-headline',
+        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                             text: _("Authentication Required") });
 
         messageBox.add(this._subjectLabel,
                        { y_fill:  false,
                          y_align: St.Align.START });
 
-        this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
+        this._descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
                                                 text: message });
         this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._descriptionLabel.clutter_text.line_wrap = true;
@@ -120,9 +101,11 @@ AuthenticationDialog.prototype = {
             let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
                                              vertical: false });
             messageBox.add(userBox);
-            this._userIcon = new St.Icon();
+            this._userAvatar = new UserMenu.UserAvatarWidget(this._user,
-            this._userIcon.hide();
+                                                             { iconSize: DIALOG_ICON_SIZE,
-            userBox.add(this._userIcon,
+                                                               styleClass: 'polkit-dialog-user-icon' });
+            this._userAvatar.actor.hide();
+            userBox.add(this._userAvatar.actor,
                         { x_fill:  true,
                           y_fill:  false,
                           x_align: St.Align.END,
@@ -138,27 +121,27 @@ AuthenticationDialog.prototype = {
 
         this._onUserChanged();
 
-        this._passwordBox = new St.BoxLayout({ vertical: false });
+        this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
         messageBox.add(this._passwordBox);
-        this._passwordLabel = new St.Label(({ style_class: 'polkit-dialog-password-label' }));
+        this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
-        this._passwordBox.add(this._passwordLabel);
+        this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
-        this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
+        this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                              text: "",
                                              can_focus: true});
         ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
         this._passwordBox.add(this._passwordEntry,
-                              {expand: true });
+                              { expand: true });
         this.setInitialKeyFocus(this._passwordEntry);
         this._passwordBox.hide();
 
-        this._errorMessageLabel = new St.Label({ style_class: 'polkit-dialog-error-label' });
+        this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
         this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._errorMessageLabel.clutter_text.line_wrap = true;
         messageBox.add(this._errorMessageLabel);
         this._errorMessageLabel.hide();
 
-        this._infoMessageLabel = new St.Label({ style_class: 'polkit-dialog-info-label' });
+        this._infoMessageLabel = new St.Label({ style_class: 'prompt-dialog-info-label' });
         this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._infoMessageLabel.clutter_text.line_wrap = true;
         messageBox.add(this._infoMessageLabel);
@@ -168,8 +151,9 @@ AuthenticationDialog.prototype = {
          * infoMessage and errorMessageLabel - but it is still invisible because
          * gnome-shell.css sets the color to be transparent
          */
-        this._nullMessageLabel = new St.Label({ style_class: 'polkit-dialog-null-label',
+        this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
                                                 text: 'abc'});
+        this._nullMessageLabel.add_style_class_name('hidden');
         this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._nullMessageLabel.clutter_text.line_wrap = true;
         messageBox.add(this._nullMessageLabel);
@@ -180,7 +164,8 @@ AuthenticationDialog.prototype = {
                            key:    Clutter.Escape
                          },
                          { label:  _("Authenticate"),
-                           action: Lang.bind(this, this._onAuthenticateButtonPressed)
+                           action: Lang.bind(this, this._onAuthenticateButtonPressed),
+                           default: true
                          }]);
 
         this._doneEmitted = false;
@@ -271,7 +256,7 @@ AuthenticationDialog.prototype = {
 
     _onSessionRequest: function(session, request, echo_on) {
         // Cheap localization trick
-        if (request == 'Password:')
+        if (request == 'Password:' || request == 'Password: ')
             this._passwordLabel.set_text(_("Password:"));
         else
             this._passwordLabel.set_text(request);
@@ -314,19 +299,9 @@ AuthenticationDialog.prototype = {
     },
 
     _onUserChanged: function() {
-        if (this._user.is_loaded) {
+        if (this._user.is_loaded && this._userAvatar) {
-            if (this._userIcon) {
+            this._userAvatar.update();
-                let iconFileName = this._user.get_icon_file();
+            this._userAvatar.actor.show();
-                let iconFile = Gio.file_new_for_path(iconFileName);
-                let icon;
-                if (iconFile.query_exists(null)) {
-                    icon = new Gio.FileIcon({file: iconFile});
-                } else {
-                    icon = new Gio.ThemedIcon({name: 'avatar-default'});
-                }
-                this._userIcon.set_gicon (icon);
-                this._userIcon.show();
-            }
         }
     },
 
@@ -335,21 +310,27 @@ AuthenticationDialog.prototype = {
         this.close(global.get_current_time());
         this._emitDone(false, true);
     },
-
+});
-};
 Signals.addSignalMethods(AuthenticationDialog.prototype);
 
-function AuthenticationAgent() {
+const AuthenticationAgent = new Lang.Class({
-    this._init();
+    Name: 'AuthenticationAgent',
-}
 
-AuthenticationAgent.prototype = {
     _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) {
@@ -399,13 +380,12 @@ AuthenticationAgent.prototype = {
                                  Lang.bind(this,
                                            function() {
                                                this._reallyCompleteRequest(wasDismissed);
+                                               return false;
                                            }));
         } else {
             this._reallyCompleteRequest(wasDismissed);
         }
     }
-}
+});
 
-function init() {
+const Component = AuthenticationAgent;
-    let agent = new AuthenticationAgent();
-}

js/ui/components/recorder.js

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

js/ui/contactDisplay.js

@@ -1,185 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Folks = imports.gi.Folks
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Util = imports.misc.util;
-const IconGrid = imports.ui.iconGrid;
-const Search = imports.ui.search;
-const SearchDisplay = imports.ui.searchDisplay;
-
-const MAX_SEARCH_RESULTS_ROWS = 1;
-const ICON_SIZE = 81;
-
-function launchContact(id) {
-    Util.spawn(['gnome-contacts', '-i', id]);
-}
-
-
-/* This class represents a shown contact search result in the overview */
-function Contact(id) {
-    this._init(id);
-}
-
-Contact.prototype = {
-    _init: function(id) {
-        this._contactSys = Shell.ContactSystem.get_default();
-        this.individual = this._contactSys.get_individual(id);
-
-        this.actor = new St.Bin({ style_class: 'contact',
-                                  reactive: true,
-                                  track_hover: true });
-
-        let content = new St.BoxLayout( { style_class: 'contact-content',
-                                          vertical: false });
-        this.actor.set_child(content);
-
-        let icon = new St.Icon({ icon_type: St.IconType.FULLCOLOR,
-                                 icon_size: ICON_SIZE,
-                                 style_class: 'contact-icon' });
-        if (this.individual.avatar != null)
-            icon.gicon = this.individual.avatar;
-        else
-            icon.icon_name = 'avatar-default';
-
-        content.add(icon, { x_fill: true,
-                            y_fill: false,
-                            x_align: St.Align.START,
-                            y_align: St.Align.MIDDLE });
-
-        let details = new St.BoxLayout({ style_class: 'contact-details',
-                                         vertical: true });
-        content.add(details, { x_fill: true,
-                               y_fill: false,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
-
-        let email = this._contactSys.get_email_for_display(this.individual);
-        let aliasText = this.individual.alias     ||
-                        this.individual.full_name ||
-                        this.individual.nickname  ||
-                        email                     ||
-                        _("Unknown");
-        let aliasLabel = new St.Label({ text: aliasText,
-                                        style_class: 'contact-details-alias' });
-        details.add(aliasLabel, { x_fill: true,
-                                  y_fill: false,
-                                  x_align: St.Align.START,
-                                  y_align: St.Align.START });
-
-        let presence = this._createPresence(this.individual.presence_type);
-        details.add(presence, { x_fill: false,
-                                y_fill: true,
-                                x_align: St.Align.START,
-                                y_align: St.Align.END });
-    },
-
-    _createPresence: function(presence) {
-        let text;
-        let iconName;
-
-        switch(presence) {
-          case Folks.PresenceType.AVAILABLE:
-            text = _("Available");
-            iconName = 'user-available';
-            break;
-          case Folks.PresenceType.AWAY:
-          case Folks.PresenceType.EXTENDED_AWAY:
-            text = _("Away");
-            iconName = 'user-away';
-            break;
-          case Folks.PresenceType.BUSY:
-            text = _("Busy");
-            iconName = 'user-busy';
-            break;
-          default:
-            text = _("Offline");
-            iconName = 'user-offline';
-          }
-
-        let icon = new St.Icon({ icon_name: iconName,
-                                 icon_type: St.IconType.FULLCOLOR,
-                                 icon_size: 16,
-                                 style_class: 'contact-details-status-icon' });
-        let label = new St.Label({ text: text });
-
-        let box = new St.BoxLayout({ vertical: false,
-                                     style_class: 'contact-details-status' });
-        box.add(icon, { x_fill: true,
-                        y_fill: false,
-                        x_align: St.Align.START,
-                        y_align: St.Align.START });
-
-        box.add(label, { x_fill: true,
-                         y_fill: false,
-                         x_align: St.Align.END,
-                         y_align: St.Align.START });
-
-        return box;
-    },
-
-    createIcon: function(size) {
-        let tc = St.TextureCache.get_default();
-        let icon = this.individual.avatar;
-
-        if (icon != null) {
-            return tc.load_gicon(null, icon, size);
-        } else {
-            return tc.load_icon_name(null, 'avatar-default', St.IconType.FULLCOLOR, size);
-        }
-    },
-};
-
-
-/* Searches for and returns contacts */
-function ContactSearchProvider() {
-    this._init();
-}
-
-ContactSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("CONTACTS"));
-        this._contactSys = Shell.ContactSystem.get_default();
-    },
-
-    getResultMeta: function(id) {
-        let contact = new Contact(id);
-        return { 'id': id,
-                 'name': contact.alias,
-                 'createIcon': function(size) {
-                         return contact.createIcon(size);
-                 }
-        };
-    },
-
-    getInitialResultSet: function(terms) {
-        return this._contactSys.initial_search(terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        return this._contactSys.subsearch(previousResults, terms);
-    },
-
-    createResultActor: function(resultMeta, terms) {
-        let contact = new Contact(resultMeta.id);
-        return contact.actor;
-    },
-
-    createResultContainerActor: function() {
-        let grid = new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
-                                             xAlign: St.Align.START });
-        grid.actor.style_class = 'contact-grid';
-
-        let actor = new SearchDisplay.GridSearchResults(this, grid);
-        return actor;
-    },
-
-    activateResult: function(id, params) {
-        launchContact(id);
-    }
-};

js/ui/ctrlAltTab.js

@@ -1,15 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
-const AltTab = imports.ui.altTab;
 const Main = imports.ui.main;
+const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
@@ -22,14 +21,14 @@ const SortGroup = {
     BOTTOM: 2
 };
 
-function CtrlAltTabManager() {
+const CtrlAltTabManager = new Lang.Class({
-    this._init();
+    Name: 'CtrlAltTabManager',
-}
 
-CtrlAltTabManager.prototype = {
     _init: function() {
         this._items = [];
-        this._focusManager = St.FocusManager.get_for_stage(global.stage);
+        this.addGroup(global.window_group, _("Windows"),
+                      'emblem-documents-symbolic', { sortGroup: SortGroup.TOP,
+                                                     focusCallback: Lang.bind(this, this._focusWindows) });
     },
 
     addGroup: function(root, name, icon, params) {
@@ -43,11 +42,13 @@ CtrlAltTabManager.prototype = {
 
         this._items.push(item);
         root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
-        this._focusManager.add_group(root);
+        if (root instanceof St.Widget)
+            global.focus_manager.add_group(root);
     },
 
     removeGroup: function(root) {
-        this._focusManager.remove_group(root);
+        if (root instanceof St.Widget)
+            global.focus_manager.remove_group(root);
         for (let i = 0; i < this._items.length; i++) {
             if (this._items[i].root == root) {
                 this._items.splice(i, 1);
@@ -56,17 +57,16 @@ CtrlAltTabManager.prototype = {
         }
     },
 
-    focusGroup: function(item) {
+    focusGroup: function(item, timestamp) {
-        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+        if (item.focusCallback) {
-            global.stage_input_mode == Shell.StageInputMode.NORMAL)
+            item.focusCallback(timestamp);
-            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+        } else {
+            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)
-            Main.activateWindow(item.window);
-        else if (item.focusCallback)
-            item.focusCallback();
-        else
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     // Sort the items into a consistent order; panel first, tray last,
@@ -77,24 +77,14 @@ CtrlAltTabManager.prototype = {
         if (a.sortGroup != b.sortGroup)
             return a.sortGroup - b.sortGroup;
 
-        let y;
+        let ax, bx, y;
-        if (a.x == undefined) {
+        [ax, y] = a.proxy.get_transformed_position();
-            if (a.window)
+        [bx, y] = b.proxy.get_transformed_position();
-                a.x = a.window.get_compositor_private().x;
-            else
-                [a.x, y] = a.proxy.get_transformed_position();
-        }
-        if (b.x == undefined) {
-            if (b.window)
-                b.x = b.window.get_compositor_private().x;
-            else
-                [b.x, y] = b.proxy.get_transformed_position();
-        }
 
-        return a.x - b.x;
+        return ax - bx;
     },
 
-    popup: function(backwards, mask) {
+    popup: function(backward, binding, mask) {
         // Start with the set of focus groups that are currently mapped
         let items = this._items.filter(function (item) { return item.proxy.mapped; });
 
@@ -112,8 +102,7 @@ CtrlAltTabManager.prototype = {
                     icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                 else
                     icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
-                items.push({ window: windows[i],
+                items.push({ name: windows[i].title,
-                             name: windows[i].title,
                              iconActor: icon,
                              sortGroup: SortGroup.MIDDLE });
             }
@@ -125,195 +114,66 @@ CtrlAltTabManager.prototype = {
         items.sort(Lang.bind(this, this._sortItems));
 
         if (!this._popup) {
-            this._popup = new CtrlAltTabPopup();
+            this._popup = new CtrlAltTabPopup(items);
-            this._popup.show(items, backwards, mask);
+            this._popup.show(backward, binding, mask);
 
             this._popup.actor.connect('destroy',
                                       Lang.bind(this, function() {
                                           this._popup = null;
                                       }));
         }
+    },
+
+    _focusWindows: function(timestamp) {
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+        global.stage.key_focus = null;
+        global.screen.focus_default_window(timestamp);
     }
-};
+});
 
-function mod(a, b) {
+const CtrlAltTabPopup = new Lang.Class({
-    return (a + b) % b;
+    Name: 'CtrlAltTabPopup',
-}
+    Extends: SwitcherPopup.SwitcherPopup,
 
-function CtrlAltTabPopup() {
+    _createSwitcher: function() {
-    this._init();
+        this._switcherList = new CtrlAltTabSwitcher(this._items);
-}
+        return true;
-
-CtrlAltTabPopup.prototype = {
-    _init : function() {
-        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
-                                                  reactive: true });
-
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._haveModal = false;
-        this._modifierMask = 0;
-        this._selection = 0;
-
-        Main.uiGroup.add_actor(this.actor);
     },
 
-    _getPreferredWidth: function (actor, forHeight, alloc) {
+    _initialSelection: function(backward, binding) {
-        let primary = Main.layoutManager.primaryMonitor;
+        if (binding == 'switch-panels') {
-
+            if (backward)
-        alloc.min_size = primary.width;
+                this._selectedIndex = this._items.length - 1;
-        alloc.natural_size = primary.width;
+        } else if (binding == 'switch-panels-backward') {
-    },
+            if (!backward)
-
+                this._selectedIndex = this._items.length - 1;
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-
-        alloc.min_size = primary.height;
-        alloc.natural_size = primary.height;
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let primary = Main.layoutManager.primaryMonitor;
-
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let vPadding = this.actor.get_theme_node().get_vertical_padding();
-        let hPadding = this.actor.get_theme_node().get_horizontal_padding();
-
-        let [childMinHeight, childNaturalHeight] = this._switcher.actor.get_preferred_height(primary.width - hPadding);
-        let [childMinWidth, childNaturalWidth] = this._switcher.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(primary.x + primary.width - hPadding, childBox.x1 + childNaturalWidth);
-        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
-        childBox.y2 = childBox.y1 + childNaturalHeight;
-        this._switcher.actor.allocate(childBox, flags);
-    },
-
-    show : function(items, startBackwards, mask) {
-        if (!Main.pushModal(this.actor))
-            return false;
-        this._haveModal = true;
-        this._modifierMask = AltTab.primaryModifier(mask);
-
-        this._keyPressEventId = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this._keyReleaseEventId = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this._items = items;
-        this._switcher = new CtrlAltTabSwitcher(items);
-        this.actor.add_actor(this._switcher.actor);
-
-        if (startBackwards)
-            this._selection = this._items.length - 1;
-        this._select(this._selection);
-
-        let [x, y, mods] = global.get_pointer();
-        if (!(mods & this._modifierMask)) {
-            this._finish();
-            return false;
         }
-
+        this._select(this._selectedIndex);
-        this.actor.opacity = 0;
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: POPUP_FADE_TIME,
-                           transition: 'easeOutQuad'
-                         });
-
-        return true;
     },
 
-    _next : function() {
+    _keyPressHandler: function(keysym, backwards, action) {
-        return mod(this._selection + 1, this._items.length);
+        if (action == Meta.KeyBindingAction.SWITCH_PANELS)
-    },
+            this._select(backwards ? this._previous() : this._next());
-
+        else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
-    _previous : function() {
+            this._select(backwards ? this._next() : this._previous());
-        return mod(this._selection - 1, this._items.length);
+        else if (keysym == Clutter.Left)
-    },
-
-    _keyPressEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
-        if (shift && keysym == Clutter.KEY_Tab)
-            keysym = Clutter.ISO_Left_Tab;
-
-        if (keysym == Clutter.KEY_Escape)
-            this.destroy();
-        else if (keysym == Clutter.KEY_Tab)
-            this._select(this._next());
-        else if (keysym == Clutter.KEY_ISO_Left_Tab)
             this._select(this._previous());
-        else if (keysym == Clutter.KEY_Left)
+        else if (keysym == Clutter.Right)
-            this._select(this._previous());
-        else if (keysym == Clutter.KEY_Right)
             this._select(this._next());
-
-        return true;
     },
 
-    _keyReleaseEvent : function(actor, event) {
+    _finish : function(time) {
-        let [x, y, mods] = global.get_pointer();
+        this.parent(time);
-        let state = mods & this._modifierMask;
+        Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
-
-        if (state == 0)
-            this._finish();
-
-        return true;
     },
+});
 
-    _finish : function() {
+const CtrlAltTabSwitcher = new Lang.Class({
-        this.destroy();
+    Name: 'CtrlAltTabSwitcher',
-
+    Extends: SwitcherPopup.SwitcherList,
-        Main.ctrlAltTabManager.focusGroup(this._items[this._selection]);
-    },
-
-    _popModal: function() {
-        if (this._haveModal) {
-            Main.popModal(this.actor);
-            this._haveModal = false;
-        }
-    },
-
-    destroy : function() {
-        this._popModal();
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: POPUP_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this.actor.destroy();
-                               })
-                         });
-    },
-
-    _onDestroy : function() {
-        this._popModal();
-        if (this._keyPressEventId)
-            this.actor.disconnect(this._keyPressEventId);
-        if (this._keyReleaseEventId)
-            this.actor.disconnect(this._keyReleaseEventId);
-    },
-
-    _select : function(num) {
-        this._selection = num;
-        this._switcher.highlight(num);
-    }
-};
-
-function CtrlAltTabSwitcher(items) {
-    this._init(items);
-}
-
-CtrlAltTabSwitcher.prototype = {
-    __proto__ : AltTab.SwitcherList.prototype,
 
     _init : function(items) {
-        AltTab.SwitcherList.prototype._init.call(this, true);
+        this.parent(true);
 
         for (let i = 0; i < items.length; i++)
             this._addIcon(items[i]);
@@ -326,7 +186,6 @@ CtrlAltTabSwitcher.prototype = {
         let icon = item.iconActor;
         if (!icon) {
             icon = new St.Icon({ icon_name: item.iconName,
-                                 icon_type: St.IconType.SYMBOLIC,
                                  icon_size: POPUP_APPICON_SIZE });
         }
         box.add(icon, { x_fill: false, y_fill: false } );
@@ -336,4 +195,4 @@ CtrlAltTabSwitcher.prototype = {
 
         this.addItem(box, text);
     }
-};
+});

js/ui/dash.js

@@ -6,6 +6,7 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Mainloop = imports.mainloop;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
@@ -16,14 +17,26 @@ const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 
 const DASH_ANIMATION_TIME = 0.2;
+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) {
+        return source.app;
+    } 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
-function DashItemContainer() {
+const DashItemContainer = new Lang.Class({
-    this._init();
+    Name: 'DashItemContainer',
-}
 
-DashItemContainer.prototype = {
     _init: function() {
         this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
         this.actor.connect('get-preferred-width',
@@ -34,6 +47,12 @@ DashItemContainer.prototype = {
                            Lang.bind(this, this._allocate));
         this.actor._delegate = this;
 
+        this._labelText = "";
+        this.label = new St.Label({ style_class: 'dash-label'});
+        this.label.hide();
+        Main.layoutManager.addChrome(this.label);
+        this.actor.label_actor = this.label;
+
         this.child = null;
         this._childScale = 1;
         this._childOpacity = 255;
@@ -86,11 +105,61 @@ DashItemContainer.prototype = {
         alloc.natural_size = natWidth * this.child.scale_y;
     },
 
+    showLabel: function() {
+        if (!this._labelText)
+            return;
+
+        this.label.set_text(this._labelText);
+        this.label.opacity = 0;
+        this.label.show();
+
+        let [stageX, stageY] = this.actor.get_transformed_position();
+
+        let itemHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
+
+        let labelHeight = this.label.get_height();
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
+
+        let y = stageY + yOffset;
+
+        let node = this.label.get_theme_node();
+        let xOffset = node.get_length('-x-offset');
+
+        let x;
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            x = stageX - this.label.get_width() - xOffset;
+        else
+            x = stageX + this.actor.get_width() + xOffset;
+
+        this.label.set_position(x, y);
+        Tweener.addTween(this.label,
+                         { opacity: 255,
+                           time: DASH_ITEM_LABEL_SHOW_TIME,
+                           transition: 'easeOutQuad',
+                         });
+    },
+
+    setLabelText: function(text) {
+        this._labelText = text;
+        this.child.accessible_name = text;
+    },
+
+    hideLabel: function () {
+        Tweener.addTween(this.label,
+                         { opacity: 0,
+                           time: DASH_ITEM_LABEL_HIDE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                               this.label.hide();
+                           })
+                         });
+    },
+
     setChild: function(actor) {
         if (this.child == actor)
             return;
 
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         this.child = actor;
         this.actor.add_actor(this.child);
@@ -110,7 +179,17 @@ DashItemContainer.prototype = {
                          });
     },
 
+    destroy: function() {
+        if (this.label)
+            this.label.destroy();
+
+        this.actor.destroy();
+    },
+
     animateOutAndDestroy: function() {
+        if (this.label)
+            this.label.destroy();
+
         if (this.child == null) {
             this.actor.destroy();
             return;
@@ -157,57 +236,78 @@ DashItemContainer.prototype = {
     get childOpacity() {
         return this._childOpacity;
     }
-};
+});
 
-function RemoveFavoriteIcon() {
+const ShowAppsIcon = new Lang.Class({
-    this._init();
+    Name: 'ShowAppsIcon',
-}
+    Extends: DashItemContainer,
-
-RemoveFavoriteIcon.prototype = {
-    __proto__: DashItemContainer.prototype,
 
     _init: function() {
-        DashItemContainer.prototype._init.call(this);
+        this.parent();
 
-        this._iconBin = new St.Bin({ style_class: 'remove-favorite' });
+        this.toggleButton = new St.Button({ style_class: 'show-apps',
+                                            track_hover: true,
+                                            can_focus: true,
+                                            toggle_mode: true });
         this._iconActor = null;
-        this.icon = new IconGrid.BaseIcon(_("Remove"),
+        this.icon = new IconGrid.BaseIcon(_("Show Applications"),
                                            { setSizeManually: true,
                                              showLabel: false,
                                              createIcon: Lang.bind(this, this._createIcon) });
-        this._iconBin.set_child(this.icon.actor);
+        this.toggleButton.add_actor(this.icon.actor);
-        this._iconBin._delegate = this;
+        this.toggleButton._delegate = this;
 
-        this.setChild(this._iconBin);
+        this.setChild(this.toggleButton);
+        this.setDragApp(null);
     },
 
     _createIcon: function(size) {
-        this._iconActor = new St.Icon({ icon_name: 'user-trash',
+        this._iconActor = new St.Icon({ icon_name: 'view-grid-symbolic',
-                                        style_class: 'remove-favorite-icon',
+                                        icon_size: size,
-                                        icon_size: size });
+                                        style_class: 'show-apps-icon',
+                                        track_hover: true });
         return this._iconActor;
     },
 
-    setHover: function(hovered) {
+    _canRemoveApp: function(app) {
-        this._iconBin.set_hover(hovered);
+        if (app == null)
-        if (this._iconActor)
+            return false;
-            this._iconActor.set_hover(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;
+        let app = getAppFromSource(source);
-        if (source instanceof AppDisplay.AppWellIcon) {
+        if (app == null)
-            let appSystem = Shell.AppSystem.get_default();
+            return false;
-            app = appSystem.lookup_app(source.getId());
-        } else if (source.metaWindow) {
-            let tracker = Shell.WindowTracker.get_default();
-            app = tracker.get_window_app(source.metaWindow);
-        }
 
         let id = app.get_id();
 
@@ -219,28 +319,54 @@ RemoveFavoriteIcon.prototype = {
 
         return true;
     }
-};
+});
 
-
+const DragPlaceholderItem = new Lang.Class({
-function DragPlaceholderItem() {
+    Name: 'DragPlaceholderItem',
-    this._init();
+    Extends: DashItemContainer,
-}
-
-DragPlaceholderItem.prototype = {
-    __proto__: DashItemContainer.prototype,
 
     _init: function() {
-        DashItemContainer.prototype._init.call(this);
+        this.parent();
         this.setChild(new St.Bin({ style_class: 'placeholder' }));
     }
-};
+});
 
+const DashActor = new Lang.Class({
+    Name: 'DashActor',
+    Extends: St.Widget,
 
-function Dash() {
+    _init: function() {
-    this._init();
+        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',
 
-Dash.prototype = {
     _init : function() {
         this._maxHeight = -1;
         this.iconSize = 64;
@@ -249,14 +375,25 @@ Dash.prototype = {
         this._dragPlaceholder = null;
         this._dragPlaceholderPos = -1;
         this._animatingPlaceholdersCount = 0;
-        this._favRemoveTarget = null;
+        this._showLabelTimeoutId = 0;
+        this._resetHoverTimeoutId = 0;
+        this._labelShowing = false;
 
-        this._box = new St.BoxLayout({ name: 'dash',
+        this._container = new DashActor();
-                                       vertical: true,
+        this._box = new St.BoxLayout({ vertical: true,
                                        clip_to_allocation: true });
         this._box._delegate = this;
+        this._container.add_actor(this._box);
 
-        this.actor = new St.Bin({ y_align: St.Align.START, child: this._box });
+        this._showAppsIcon = new ShowAppsIcon();
+        this._showAppsIcon.icon.setIconSize(this.iconSize);
+        this._hookUpLabel(this._showAppsIcon);
+
+        this.showAppsButton = this._showAppsIcon.toggleButton;
+
+        this._container.add_actor(this._showAppsIcon.actor);
+
+        this.actor = new St.Bin({ child: this._container });
         this.actor.connect('notify::height', Lang.bind(this,
             function() {
                 if (this._maxHeight != this.actor.height)
@@ -266,7 +403,6 @@ Dash.prototype = {
 
         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));
@@ -309,53 +445,25 @@ Dash.prototype = {
 
     _endDrag: function() {
         this._clearDragPlaceholder();
-        if (this._favRemoveTarget) {
+        this._showAppsIcon.setDragApp(null);
-            this._favRemoveTarget.animateOutAndDestroy();
-            this._favRemoveTarget.actor.connect('destroy', Lang.bind(this,
-                function() {
-                    this._favRemoveTarget = null;
-                }));
-            this._adjustIconSize();
-        }
         DND.removeDragMonitor(this._dragMonitor);
     },
 
     _onDragMotion: function(dragEvent) {
-        let app = null;
+        let app = getAppFromSource(dragEvent.source);
-        if (dragEvent.source instanceof AppDisplay.AppWellIcon)
+        if (app == null)
-            app = this._appSystem.lookup_app(dragEvent.source.getId());
-        else if (dragEvent.source.metaWindow)
-            app = this._tracker.get_window_app(dragEvent.source.metaWindow);
-        else
             return DND.DragMotionResult.CONTINUE;
 
-        let id = app.get_id();
+        let showAppsHovered =
+                this._showAppsIcon.actor.contains(dragEvent.targetActor);
 
-        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
+        if (!this._box.contains(dragEvent.targetActor) || showAppsHovered)
-
-        let srcIsFavorite = (id in favorites);
-
-        if (srcIsFavorite &&
-            dragEvent.source.actor &&
-            this.actor.contains (dragEvent.source.actor) &&
-            this._favRemoveTarget == null) {
-                this._favRemoveTarget = new RemoveFavoriteIcon();
-                this._favRemoveTarget.icon.setIconSize(this.iconSize);
-                this._box.add(this._favRemoveTarget.actor);
-                this._adjustIconSize();
-                this._favRemoveTarget.animateIn();
-        }
-
-        let favRemoveHovered = false;
-        if (this._favRemoveTarget)
-            favRemoveHovered =
-                this._favRemoveTarget.actor.contains(dragEvent.targetActor);
-
-        if (!this._box.contains(dragEvent.targetActor) || favRemoveHovered)
             this._clearDragPlaceholder();
 
-        if (this._favRemoveTarget)
+        if (showAppsHovered)
-            this._favRemoveTarget.setHover(favRemoveHovered);
+            this._showAppsIcon.setDragApp(app);
+        else
+            this._showAppsIcon.setDragApp(null);
 
         return DND.DragMotionResult.CONTINUE;
     },
@@ -371,28 +479,91 @@ Dash.prototype = {
         Main.queueDeferredWork(this._workId);
     },
 
+    _hookUpLabel: function(item) {
+        item.child.connect('notify::hover', Lang.bind(this, function() {
+            this._onHover(item);
+        }));
+
+        Main.overview.connect('hiding', Lang.bind(this, function() {
+            this._labelShowing = false;
+            item.hideLabel();
+        }));
+    },
+
     _createAppItem: function(app) {
-        let display = new AppDisplay.AppWellIcon(app,
+        let appIcon = new AppDisplay.AppWellIcon(app,
                                                  { setSizeManually: true,
                                                    showLabel: false });
-        display._draggable.connect('drag-begin',
+        appIcon._draggable.connect('drag-begin',
                                    Lang.bind(this, function() {
-                                       display.actor.opacity = 50;
+                                       appIcon.actor.opacity = 50;
                                    }));
-        display._draggable.connect('drag-end',
+        appIcon._draggable.connect('drag-end',
                                    Lang.bind(this, function() {
-                                       display.actor.opacity = 255;
+                                       appIcon.actor.opacity = 255;
                                    }));
-        display.actor.set_tooltip_text(app.get_name());
+        appIcon.connect('menu-state-changed',
+                        Lang.bind(this, function(appIcon, opened) {
+                            this._itemMenuStateChanged(item, opened);
+                        }));
 
         let item = new DashItemContainer();
-        item.setChild(display.actor);
+        item.setChild(appIcon.actor);
 
-        display.icon.setIconSize(this.iconSize);
+        // Override default AppWellIcon label_actor, now the
+        // accessible_name is set at DashItemContainer.setLabelText
+        appIcon.actor.label_actor = null;
+        item.setLabelText(app.get_name());
+
+        appIcon.icon.setIconSize(this.iconSize);
+        this._hookUpLabel(item);
 
         return item;
     },
 
+    _itemMenuStateChanged: function(item, opened) {
+        // When the menu closes, it calls sync_hover, which means
+        // that the notify::hover handler does everything we need to.
+        if (opened) {
+            if (this._showLabelTimeoutId > 0) {
+                Mainloop.source_remove(this._showLabelTimeoutId);
+                this._showLabelTimeoutId = 0;
+            }
+
+            item.hideLabel();
+        }
+    },
+
+    _onHover: function (item) {
+        if (item.child.get_hover()) {
+            if (this._showLabelTimeoutId == 0) {
+                let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
+                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
+                    Lang.bind(this, function() {
+                        this._labelShowing = true;
+                        item.showLabel();
+                        return false;
+                    }));
+                if (this._resetHoverTimeoutId > 0) {
+                    Mainloop.source_remove(this._resetHoverTimeoutId);
+                    this._resetHoverTimeoutId = 0;
+                }
+            }
+        } else {
+            if (this._showLabelTimeoutId > 0)
+                Mainloop.source_remove(this._showLabelTimeoutId);
+            this._showLabelTimeoutId = 0;
+            item.hideLabel();
+            if (this._labelShowing) {
+                this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
+                    Lang.bind(this, function() {
+                        this._labelShowing = false;
+                        return false;
+                    }));
+            }
+        }
+    },
+
     _adjustIconSize: function() {
         // For the icon size, we only consider children which are "proper"
         // icons (i.e. ignoring drag placeholders) and which are not
@@ -405,18 +576,12 @@ Dash.prototype = {
                    !actor._delegate.animatingOut;
         });
 
-        if (iconChildren.length == 0) {
+        iconChildren.push(this._showAppsIcon.actor);
-            this._box.add_style_pseudo_class('empty');
-            return;
-        }
-
-        this._box.remove_style_pseudo_class('empty');
 
         if (this._maxHeight == -1)
             return;
 
-
+        let themeNode = this._container.get_theme_node();
-        let themeNode = this.actor.get_theme_node();
         let maxAllocation = new Clutter.ActorBox({ x1: 0, y1: 0,
                                                    x2: 42 /* whatever */,
                                                    y2: this._maxHeight });
@@ -442,7 +607,6 @@ Dash.prototype = {
             [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
         }
 
-
         // Subtract icon padding and box spacing from the available height
         availHeight -= iconChildren.length * (natHeight - this.iconSize) +
                        (iconChildren.length - 1) * spacing;
@@ -473,8 +637,10 @@ Dash.prototype = {
             icon.setIconSize(this.iconSize);
 
             // Don't animate the icon size change when the overview
-            // is not visible or when initially filling the dash
+            // is transitioning, not visible or when initially filling
-            if (!Main.overview.visible || !this._shownInitially)
+            // the dash
+            if (!Main.overview.visible || Main.overview.animationInProgress ||
+                !this._shownInitially)
                 continue;
 
             let [targetWidth, targetHeight] = icon.icon.get_size();
@@ -592,17 +758,18 @@ Dash.prototype = {
         }
 
         for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_actor(addedItems[i].item.actor,
+            this._box.insert_child_at_index(addedItems[i].item.actor,
-                                   addedItems[i].pos);
+                                            addedItems[i].pos);
 
         for (let i = 0; i < removedActors.length; i++) {
             let item = removedActors[i]._delegate;
 
-            // Don't animate item removal when the overview is hidden
+            // Don't animate item removal when the overview is transitioning
-            if (Main.overview.visible)
+            // or hidden
+            if (Main.overview.visible && !Main.overview.animationInProgress)
                 item.animateOutAndDestroy();
             else
-                item.actor.destroy();
+                item.destroy();
         }
 
         this._adjustIconSize();
@@ -614,8 +781,9 @@ Dash.prototype = {
             return;
         }
 
-        // Don't animate item addition when the overview is hidden
+        // Don't animate item addition when the overview is transitioning
-        if (!Main.overview.visible)
+        // or hidden
+        if (!Main.overview.visible || Main.overview.animationInProgress)
             return;
 
         for (let i = 0; i < addedItems.length; i++)
@@ -631,11 +799,7 @@ Dash.prototype = {
     },
 
     handleDragOver : function(source, actor, x, y, time) {
-        let app = null;
+        let app = getAppFromSource(source);
-        if (source instanceof AppDisplay.AppWellIcon)
-            app = this._appSystem.lookup_app(source.getId());
-        else if (source.metaWindow)
-            app = this._tracker.get_window_app(source.metaWindow);
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed())
@@ -658,20 +822,10 @@ Dash.prototype = {
             numChildren--;
         }
 
-        let pos = Math.round(y * numChildren / boxHeight);
+        let pos = Math.floor(y * numChildren / boxHeight);
 
-        if (pos != this._dragPlaceholderPos && pos <= numFavorites) {
+        if (pos != this._dragPlaceholderPos && pos <= numFavorites && this._animatingPlaceholdersCount == 0) {
-            if (this._animatingPlaceholdersCount > 0) {
+            this._dragPlaceholderPos = pos;
-                let appChildren = children.filter(function(actor) {
-                    return actor._delegate &&
-                           actor._delegate.child &&
-                           actor._delegate.child._delegate &&
-                           actor._delegate.child._delegate.app;
-                });
-                this._dragPlaceholderPos = children.indexOf(appChildren[pos]);
-            } else {
-                this._dragPlaceholderPos = pos;
-            }
 
             // Don't allow positioning before or after self
             if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
@@ -702,12 +856,20 @@ Dash.prototype = {
             this._dragPlaceholder = new DragPlaceholderItem();
             this._dragPlaceholder.child.set_width (this.iconSize);
             this._dragPlaceholder.child.set_height (this.iconSize / 2);
-            this._box.insert_actor(this._dragPlaceholder.actor,
+            this._box.insert_child_at_index(this._dragPlaceholder.actor,
-                                   this._dragPlaceholderPos);
+                                            this._dragPlaceholderPos);
             if (fadeIn)
                 this._dragPlaceholder.animateIn();
         }
 
+        // Remove the drag placeholder if we are not in the
+        // "favorites zone"
+        if (pos > numFavorites && this._dragPlaceholder) {
+            this._clearDragPlaceholder();
+        }
+        if (!this._dragPlaceholder)
+            return DND.DragMotionResult.NO_DROP;
+
         let srcIsFavorite = (favPos != -1);
 
         if (srcIsFavorite)
@@ -718,12 +880,7 @@ Dash.prototype = {
 
     // Draggable target interface
     acceptDrop : function(source, actor, x, y, time) {
-        let app = null;
+        let app = getAppFromSource(source);
-        if (source instanceof AppDisplay.AppWellIcon) {
-            app = this._appSystem.lookup_app(source.getId());
-        } else if (source.metaWindow) {
-            app = this._tracker.get_window_app(source.metaWindow);
-        }
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed()) {
@@ -750,6 +907,11 @@ Dash.prototype = {
                 favPos++;
         }
 
+        // No drag placeholder means we don't wan't to favorite the app
+        // and we are dragging it to its original position
+        if (!this._dragPlaceholder)
+            return true;
+
         Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
             function () {
                 let appFavorites = AppFavorites.getAppFavorites();
@@ -762,6 +924,6 @@ Dash.prototype = {
 
         return true;
     }
-};
+});
 
 Signals.addSignalMethods(Dash.prototype);

js/ui/dateMenu.js

@@ -2,12 +2,14 @@
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const Params = imports.misc.params;
 const Util = imports.misc.util;
@@ -15,14 +17,6 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
-const UPowerGlib = imports.gi.UPowerGlib;
-
-// in org.gnome.desktop.interface
-const CLOCK_FORMAT_KEY        = 'clock-format';
-
-// in org.gnome.shell.clock
-const CLOCK_SHOW_DATE_KEY     = 'show-date';
-const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';
 
 function _onVertSepRepaint (area)
 {
@@ -40,27 +34,27 @@ function _onVertSepRepaint (area)
     cr.stroke();
 };
 
-function DateMenuButton() {
+const DateMenuButton = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'DateMenuButton',
-}
+    Extends: PanelMenu.Button,
-
-DateMenuButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
-
-    _init: function(params) {
-        params = Params.parse(params, { showEvents: true });
 
+    _init: function() {
         let item;
         let hbox;
         let vbox;
 
         let menuAlignment = 0.25;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             menuAlignment = 1.0 - menuAlignment;
-        PanelMenu.Button.prototype._init.call(this, menuAlignment);
+        this.parent(menuAlignment);
 
-        this._clock = new St.Label();
+        // At this moment calendar menu is not keyboard navigable at
-        this.actor.add_actor(this._clock);
+        // all (so not accessible), so it doesn't make sense to set as
+        // role ATK_ROLE_MENU like other elements of the panel.
+        this.actor.accessible_role = Atk.Role.LABEL;
+
+        this._clockDisplay = new St.Label();
+        this.actor.add_actor(this._clockDisplay);
 
         hbox = new St.BoxLayout({name: 'calendarArea' });
         this.menu.addActor(hbox);
@@ -72,19 +66,12 @@ DateMenuButton.prototype = {
 
         // Date
         this._date = new St.Label();
+        this.actor.label_actor = this._clockDisplay;
         this._date.style_class = 'datemenu-date-label';
         vbox.add(this._date);
 
-        if (params.showEvents) {
+        this._eventList = new Calendar.EventsList();
-            this._eventSource = new Calendar.DBusEventSource();
+        this._calendar = new Calendar.Calendar();
-            this._eventList = new Calendar.EventsList(this._eventSource);
-        } else {
-            this._eventSource = null;
-            this._eventList = null;
-        }
-
-        // Calendar
-        this._calendar = new Calendar.Calendar(this._eventSource);
 
         this._calendar.connect('selected-date-changed',
                                Lang.bind(this, function(calendar, date) {
@@ -102,31 +89,34 @@ DateMenuButton.prototype = {
             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 (params.showEvents) {
+        this._separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-            // Add 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',
+        // Fill up the second column
-                                        pseudo_class: 'highlighted' });
+        vbox = new St.BoxLayout({ name: 'calendarEventsArea',
-            item.connect('repaint', Lang.bind(this, _onVertSepRepaint));
+                                  vertical: true });
-            hbox.add(item);
+        hbox.add(vbox, { expand: true });
 
-            // Fill up the second column
+        // Event list
-            vbox = new St.BoxLayout({name:     'calendarEventsArea',
+        vbox.add(this._eventList.actor, { expand: true });
-                                     vertical: true});
-            hbox.add(vbox, { expand: true });
 
-            // Event list
+        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
-            vbox.add(this._eventList.actor, { expand: true });
+        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"));
+        this._calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
-            item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        this._calendarSettings.connect('changed::exec',
-            item.actor.can_focus = false;
+                                       Lang.bind(this, this._calendarSettingsChanged));
-            vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        this._calendarSettingsChanged();
-        }
 
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
@@ -153,79 +143,75 @@ DateMenuButton.prototype = {
 
         // Done with hbox for calendar and event list
 
-        // Track changes to clock settings
+        this._clock = new GnomeDesktop.WallClock();
-        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
-        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
-        this._desktopSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
-        this._clockSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
-
-        // https://bugzilla.gnome.org/show_bug.cgi?id=655129
-        this._upClient = new UPowerGlib.Client();
-        this._upClient.connect('notify-resume', Lang.bind(this, this._updateClockAndDate));
-
-        // Start the clock
         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() {
-        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        this._clockDisplay.set_text(this._clock.clock);
-        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
-        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
-
-        let clockFormat;
-        let dateFormat;
-
-        switch (format) {
-            case '24h':
-                if (showDate)
-                    /* Translators: This is the time format with date used
-                       in 24-hour mode. */
-                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
-                                              : _("%a %b %e, %R");
-                else
-                    /* Translators: This is the time format without date used
-                       in 24-hour mode. */
-                    clockFormat = showSeconds ? _("%a %R:%S")
-                                              : _("%a %R");
-                break;
-            case '12h':
-            default:
-                if (showDate)
-                    /* Translators: This is a time format with date used
-                       for AM/PM. */
-                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
-                                              : _("%a %b %e, %l:%M %p");
-                else
-                    /* Translators: This is a time format without date used
-                       for AM/PM. */
-                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
-                                              : _("%a %l:%M %p");
-                break;
-        }
-
-        let displayDate = new Date();
-
-        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
-
         /* Translators: This is the date format to use when the calendar popup is
          * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
          */
-        dateFormat = _("%A %B %e, %Y");
+        let dateFormat = _("%A %B %e, %Y");
+        let displayDate = new Date();
         this._date.set_text(displayDate.toLocaleFormat(dateFormat));
-
-        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
-        return false;
     },
 
     _onOpenCalendarActivate: function() {
         this.menu.close();
-        let calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
+        let tool = this._calendarSettings.get_string('exec');
-        let tool = calendarSettings.get_string('exec');
+        if (tool.length == 0 || tool.substr(0, 9) == 'evolution') {
-        if (tool.length == 0 || tool == 'evolution') {
             // TODO: pass the selected day
-            Util.spawn(['evolution', '-c', 'calendar']);
+            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');
@@ -239,4 +225,4 @@ DateMenuButton.prototype = {
             }
         }
     }
-};
+});

js/ui/dnd.js

@@ -69,11 +69,9 @@ function removeDragMonitor(monitor) {
         }
 }
 
-function _Draggable(actor, params) {
+const _Draggable = new Lang.Class({
-    this._init(actor, params);
+    Name: 'Draggable',
-}
 
-_Draggable.prototype = {
     _init : function(actor, params) {
         params = Params.parse(params, { manualMode: false,
                                         restoreOnSuccess: false,
@@ -105,8 +103,8 @@ _Draggable.prototype = {
         this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
         this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
 
-        // During the drag, we eat enter/leave events so that actors don't prelight or show
+        // During the drag, we eat enter/leave events so that actors don't prelight.
-        // tooltips. But we remember the actors that we first left/last entered so we can
+        // But we remember the actors that we first left/last entered so we can
         // fix up the hover state after the drag ends.
         this._firstLeaveActor = null;
         this._lastEnterActor = null;
@@ -122,13 +120,7 @@ _Draggable.prototype = {
             return false;
 
         this._buttonDown = true;
-        // special case St.Button: grabbing the pointer would mess up the
+        this._grabActor();
-        // internal state, so we start the drag manually on hover change
-        if (this.actor instanceof St.Button)
-            this.actor.connect('notify::hover',
-                               Lang.bind(this, this._onButtonHoverChanged));
-        else
-            this._grabActor();
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -137,15 +129,6 @@ _Draggable.prototype = {
         return false;
     },
 
-    _onButtonHoverChanged: function(button) {
-        if (button.hover || !button.pressed)
-            return;
-
-        button.fake_release();
-        this.startDrag(this._dragStartX, this._dragStartY,
-                       global.get_current_time());
-    },
-
     _grabActor: function() {
         Clutter.grab_pointer(this.actor);
         this._onEventId = this.actor.connect('event',
@@ -234,6 +217,13 @@ _Draggable.prototype = {
         currentDraggable = this;
         this._dragInProgress = true;
 
+        // Special-case St.Button: the pointer grab messes with the internal
+        // state, so force a reset to a reasonable state here
+        if (this.actor instanceof St.Button) {
+            this.actor.fake_release();
+            this.actor.hover = false;
+        }
+
         this.emit('drag-begin', time);
         if (this._onEventId)
             this._ungrabActor();
@@ -244,7 +234,11 @@ _Draggable.prototype = {
         this._dragY = this._dragStartY = stageY;
 
         if (this.actor._delegate && this.actor._delegate.getDragActor) {
-            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
+            this._dragActor = this.actor._delegate.getDragActor();
+            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.
@@ -273,12 +267,17 @@ _Draggable.prototype = {
             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;
@@ -290,10 +289,6 @@ _Draggable.prototype = {
                                  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;
@@ -596,7 +591,7 @@ _Draggable.prototype = {
         this._dragActor = undefined;
         currentDraggable = null;
     }
-};
+});
 
 Signals.addSignalMethods(_Draggable.prototype);
 

js/ui/docDisplay.js

@@ -1,47 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const DocInfo = imports.misc.docInfo;
-const Params = imports.misc.params;
-const Search = imports.ui.search;
-
-
-function DocSearchProvider() {
-    this._init();
-}
-
-DocSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function(name) {
-        Search.SearchProvider.prototype._init.call(this, _("RECENT ITEMS"));
-        this._docManager = DocInfo.getDocManager();
-    },
-
-    getResultMeta: function(resultId) {
-        let docInfo = this._docManager.lookupByUri(resultId);
-        if (!docInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': docInfo.name,
-                 'createIcon': function(size) {
-                                   return docInfo.createIcon(size);
-                               }
-               };
-    },
-
-    activateResult: function(id, params) {
-        params = Params.parse(params, { workspace: -1,
-                                        timestamp: 0 });
-
-        let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch(params.workspace);
-    },
-
-    getInitialResultSet: function(terms) {
-        return this._docManager.initialSearch(terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        return this._docManager.subsearch(previousResults, terms);
-    }
-};

js/ui/endSessionDialog.js

@@ -31,10 +31,10 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
 const GnomeSession = imports.misc.gnomeSession;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
+const UserMenu = imports.ui.userMenu;
 
 let _endSessionDialog = null;
 
@@ -90,7 +90,7 @@ const shutdownDialogContent = {
                        label:  C_("button", "Restart") },
                      { signal: 'ConfirmedShutdown',
                        label:  C_("button", "Power Off") }],
-    iconName: 'system-shutdown',
+    iconName: 'system-shutdown-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
 
@@ -105,7 +105,7 @@ const restartDialogContent = {
     endDescription: _("Restarting the system."),
     confirmButtons: [{ signal: 'ConfirmedReboot',
                        label:  C_("button", "Restart") }],
-    iconName: 'system-shutdown',
+    iconName: 'view-refresh-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
 
@@ -116,37 +116,17 @@ const DialogContent = {
 };
 
 function findAppFromInhibitor(inhibitor) {
-    let desktopFile = inhibitor.app_id;
+    let [desktopFile] = inhibitor.GetAppIdSync();
 
     if (!GLib.str_has_suffix(desktopFile, '.desktop'))
-      desktopFile += '.desktop';
+        desktopFile += '.desktop';
 
-    let candidateDesktopFiles = [];
+    return Shell.AppSystem.get_default().lookup_heuristic_basename(desktopFile);
-
-    candidateDesktopFiles.push(desktopFile);
-    candidateDesktopFiles.push('gnome-' + desktopFile);
-
-    let appSystem = Shell.AppSystem.get_default();
-    let app = null;
-    for (let i = 0; i < candidateDesktopFiles.length; i++) {
-        try {
-            app = appSystem.lookup_app(candidateDesktopFiles[i]);
-
-            if (app)
-                break;
-        } catch(e) {
-            // ignore errors
-        }
-    }
-
-    return app;
 }
 
-function ListItem(app, reason) {
+const ListItem = new Lang.Class({
-    this._init(app, reason);
+    Name: 'ListItem',
-}
 
-ListItem.prototype = {
     _init: function(app, reason) {
         this._app = app;
         this._reason = reason;
@@ -181,6 +161,7 @@ ListItem.prototype = {
 
         this._descriptionLabel = new St.Label({ text:        this._reason,
                                                 style_class: 'end-session-dialog-app-list-item-description' });
+        this.actor.label_actor = this._nameLabel;
         textLayout.add(this._descriptionLabel,
                        { expand: true,
                          x_fill: true });
@@ -192,7 +173,7 @@ ListItem.prototype = {
         this.emit('activate');
         this._app.activate();
     }
-};
+});
 Signals.addSignalMethods(ListItem.prototype);
 
 // The logout timer only shows updates every 10 seconds
@@ -230,27 +211,19 @@ function _setLabelText(label, text) {
     }
 }
 
-function EndSessionDialog() {
-    if (_endSessionDialog == null) {
-        this._init();
-        _endSessionDialog = this;
-    }
-
-    return _endSessionDialog;
-}
-
 function init() {
     // This always returns the same singleton object
     // By instantiating it initially, we register the
     // bus object, etc.
-    let dialog = new EndSessionDialog();
+    _endSessionDialog = new EndSessionDialog();
 }
 
-EndSessionDialog.prototype = {
+const EndSessionDialog = new Lang.Class({
-    __proto__: ModalDialog.ModalDialog.prototype,
+    Name: 'EndSessionDialog',
+    Extends: ModalDialog.ModalDialog,
 
     _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
+        this.parent({ styleClass: 'end-session-dialog' });
 
         this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
 
@@ -308,21 +281,17 @@ EndSessionDialog.prototype = {
         scrollView.hide();
 
         this._applicationList = new St.BoxLayout({ vertical: true });
-        scrollView.add_actor(this._applicationList,
+        scrollView.add_actor(this._applicationList);
-                             { x_fill:  true,
-                               y_fill:  true,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
 
         this._applicationList.connect('actor-added',
                                       Lang.bind(this, function() {
-                                          if (this._applicationList.get_children().length == 1)
+                                          if (this._applicationList.get_n_children() == 1)
                                               scrollView.show();
                                       }));
 
         this._applicationList.connect('actor-removed',
                                       Lang.bind(this, function() {
-                                          if (this._applicationList.get_children().length == 0)
+                                          if (this._applicationList.get_n_children() == 0)
                                               scrollView.hide();
                                       }));
 
@@ -335,41 +304,7 @@ EndSessionDialog.prototype = {
         this._user.disconnect(this._userChangedId);
     },
 
-    _setIconFromFile: function(iconFile, styleClass) {
+    _updateDescription: function() {
-        if (styleClass)
-            this._iconBin.set_style_class_name(styleClass);
-        this._iconBin.set_style(null);
-
-        this._iconBin.child = null;
-        if (iconFile) {
-            this._iconBin.show();
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
-        } else {
-            this._iconBin.hide();
-        }
-    },
-
-    _setIconFromName: function(iconName, styleClass) {
-        if (styleClass)
-            this._iconBin.set_style_class_name(styleClass);
-        this._iconBin.set_style(null);
-
-        if (iconName != null) {
-            let textureCache = St.TextureCache.get_default();
-            let icon = textureCache.load_icon_name(this._iconBin.get_theme_node(),
-                                                   iconName,
-                                                   St.IconType.SYMBOLIC,
-                                                   _DIALOG_ICON_SIZE);
-
-            this._iconBin.child = icon;
-            this._iconBin.show();
-        } else {
-            this._iconBin.child = null;
-            this._iconBin.hide();
-        }
-    },
-
-    _updateContent: function() {
         if (this.state != ModalDialog.State.OPENING &&
             this.state != ModalDialog.State.OPENED)
             return;
@@ -379,17 +314,6 @@ EndSessionDialog.prototype = {
         let subject = dialogContent.subject;
         let description;
 
-        if (this._user.is_loaded && !dialogContent.iconName) {
-            let iconFile = this._user.get_icon_file();
-            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
-            else
-                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
-        } else if (dialogContent.iconName) {
-            this._setIconFromName(dialogContent.iconName,
-                                  dialogContent.iconStyleClass);
-        }
-
         if (this._inhibitors.length > 0) {
             this._stopTimer();
             description = dialogContent.inhibitedDescription;
@@ -422,6 +346,27 @@ EndSessionDialog.prototype = {
         _setLabelText(this._descriptionLabel, description);
     },
 
+    _updateContent: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
+            return;
+
+        let dialogContent = DialogContent[this._type];
+        if (dialogContent.iconName) {
+            this._iconBin.child = new St.Icon({ icon_name: dialogContent.iconName,
+                                                icon_size: _DIALOG_ICON_SIZE,
+                                                style_class: dialogContent.iconStyleClass });
+        } else {
+            let avatarWidget = new UserMenu.UserAvatarWidget(this._user,
+                                                             { iconSize: _DIALOG_ICON_SIZE,
+                                                               styleClass: dialogContent.iconStyleClass });
+            this._iconBin.child = avatarWidget.actor;
+            avatarWidget.update();
+        }
+
+        this._updateDescription();
+    },
+
     _updateButtons: function() {
         let dialogContent = DialogContent[this._type];
         let buttons = [{ action: Lang.bind(this, this.cancel),
@@ -441,7 +386,7 @@ EndSessionDialog.prototype = {
     },
 
     close: function() {
-        ModalDialog.ModalDialog.prototype.close.call(this);
+        this.parent();
         this._dbusImpl.emit_signal('Closed', null);
     },
 
@@ -468,7 +413,7 @@ EndSessionDialog.prototype = {
                          { _secondsLeft: 0,
                            time: this._secondsLeft,
                            transition: 'linear',
-                           onUpdate: Lang.bind(this, this._updateContent),
+                           onUpdate: Lang.bind(this, this._updateDescription),
                            onComplete: Lang.bind(this, function() {
                                            let dialogContent = DialogContent[this._type];
                                            let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
@@ -491,7 +436,8 @@ EndSessionDialog.prototype = {
         let app = findAppFromInhibitor(inhibitor);
 
         if (app) {
-            let item = new ListItem(app, inhibitor.reason);
+            let [reason] = inhibitor.GetReasonSync();
+            let item = new ListItem(app, reason);
             item.connect('activate',
                          Lang.bind(this, function() {
                              this.close(global.get_current_time());
@@ -510,11 +456,11 @@ EndSessionDialog.prototype = {
         let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
         this._inhibitors = [];
-        this._applicationList.destroy_children();
+        this._applicationList.destroy_all_children();
         this._type = type;
 
         if (!(this._type in DialogContent)) {
-            invocation.report_dbus_error('org.gnome.Shell.ModalDialog.TypeError',
+            invocation.return_dbus_error('org.gnome.Shell.ModalDialog.TypeError',
                                          "Unknown dialog type requested");
             return;
         }
@@ -530,7 +476,7 @@ EndSessionDialog.prototype = {
         this._updateButtons();
 
         if (!this.open(timestamp)) {
-            invocation.report_dbus_error('org.gnome.Shell.ModalDialog.GrabError',
+            invocation.return_dbus_error('org.gnome.Shell.ModalDialog.GrabError',
                                          "Cannot grab pointer and keyboard");
             return;
         }
@@ -543,4 +489,4 @@ EndSessionDialog.prototype = {
                                         this.disconnect(signalId);
                                     }));
     }
-};
+});

js/ui/environment.js

@@ -39,20 +39,23 @@ function _patchContainerClass(containerClass) {
     };
 }
 
+function _makeLoggingFunc(func) {
+    return function() {
+        return func([].join.call(arguments, ', '));
+    };
+}
+
 function init() {
     // Add some bindings to the global JS namespace; (gjs keeps the web
     // browser convention of having that namespace be called 'window'.)
     window.global = Shell.Global.get();
 
+    window.log = _makeLoggingFunc(window.log);
+
     window._ = Gettext.gettext;
     window.C_ = Gettext.pgettext;
     window.ngettext = Gettext.ngettext;
 
-    // Set the default direction for St widgets (this needs to be done before any use of St)
-    if (Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL) {
-        St.Widget.set_default_direction(St.TextDirection.RTL);
-    }
-
     // Miscellaneous monkeypatching
     _patchContainerClass(St.BoxLayout);
     _patchContainerClass(St.Table);
@@ -64,10 +67,14 @@ function init() {
     let origToString = Object.prototype.toString;
     Object.prototype.toString = function() {
         let base = origToString.call(this);
-        if ('actor' in this && this.actor instanceof Clutter.Actor)
+        try {
-            return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
+            if ('actor' in this && this.actor instanceof Clutter.Actor)
-        else
+                return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
+            else
+                return base;
+        } catch(e) {
             return base;
+        }
     };
 
     // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
@@ -83,7 +90,7 @@ function init() {
     }
 
     // OK, now things are initialized enough that we can import shell JS
-    const Format = imports.misc.format;
+    const Format = imports.format;
     const Tweener = imports.ui.tweener;
 
     Tweener.init();

js/ui/extensionDownloader.js

@@ -0,0 +1,270 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Soup = imports.gi.Soup;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Config = imports.misc.config;
+const ExtensionUtils = imports.misc.extensionUtils;
+const ExtensionSystem = imports.ui.extensionSystem;
+const FileUtils = imports.misc.fileUtils;
+const ModalDialog = imports.ui.modalDialog;
+
+const _signals = ExtensionSystem._signals;
+
+const REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
+const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
+const REPOSITORY_URL_INFO     = REPOSITORY_URL_BASE + '/extension-info/';
+const REPOSITORY_URL_UPDATE   = REPOSITORY_URL_BASE + '/update-info/';
+
+let _httpSession;
+
+function installExtension(uuid, invocation) {
+    let params = { uuid: uuid,
+                   shell_version: Config.PACKAGE_VERSION };
+
+    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
+
+    _httpSession.queue_message(message, function(session, message) {
+        if (message.status_code != Soup.KnownStatusCode.OK) {
+            ExtensionSystem.logExtensionError(uuid, 'downloading info: ' + message.status_code);
+            invocation.return_dbus_error('org.gnome.Shell.DownloadInfoError', message.status_code.toString());
+            return;
+        }
+
+        let info;
+        try {
+            info = JSON.parse(message.response_body.data);
+        } catch (e) {
+            ExtensionSystem.logExtensionError(uuid, 'parsing info: ' + e);
+            invocation.return_dbus_error('org.gnome.Shell.ParseInfoError', e.toString());
+            return;
+        }
+
+        let dialog = new InstallExtensionDialog(uuid, info, invocation);
+        dialog.open(global.get_current_time());
+    });
+}
+
+function uninstallExtension(uuid) {
+    let extension = ExtensionUtils.extensions[uuid];
+    if (!extension)
+        return false;
+
+    // Don't try to uninstall system extensions
+    if (extension.type != ExtensionUtils.ExtensionType.PER_USER)
+        return false;
+
+    if (!ExtensionSystem.unloadExtension(extension))
+        return false;
+
+    FileUtils.recursivelyDeleteDir(extension.dir, true);
+    return true;
+}
+
+function gotExtensionZipFile(session, message, uuid, dir, callback, errback) {
+    if (message.status_code != Soup.KnownStatusCode.OK) {
+        errback('DownloadExtensionError', message.status_code);
+        return;
+    }
+
+    try {
+        if (!dir.query_exists(null))
+            dir.make_directory_with_parents(null);
+    } catch (e) {
+        errback('CreateExtensionDirectoryError', e);
+        return;
+    }
+
+    let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
+    let contents = message.response_body.flatten().get_as_bytes();
+    stream.output_stream.write_bytes(contents, null);
+    stream.close(null);
+    let [success, pid] = GLib.spawn_async(null,
+                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
+                                          null,
+                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                          null);
+
+    if (!success) {
+        errback('ExtractExtensionError');
+        return;
+    }
+
+    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
+        GLib.spawn_close_pid(pid);
+
+        if (status != 0)
+            errback('ExtractExtensionError');
+        else
+            callback();
+    });
+}
+
+function updateExtension(uuid) {
+    // This gets a bit tricky. We want the update to be seamless -
+    // if we have any error during downloading or extracting, we
+    // want to not unload the current version.
+
+    let oldExtensionTmpDir = GLib.Dir.make_tmp('XXXXXX-shell-extension');
+    let newExtensionTmpDir = GLib.Dir.make_tmp('XXXXXX-shell-extension');
+
+    let params = { shell_version: Config.PACKAGE_VERSION };
+
+    let url = REPOSITORY_URL_DOWNLOAD.format(uuid);
+    let message = Soup.form_request_new_from_hash('GET', url, params);
+
+    _httpSession.queue_message(message, Lang.bind(this, function(session, message) {
+        gotExtensionZipFile(session, message, uuid, newExtensionTmpDir, function() {
+            let oldExtension = ExtensionUtils.extensions[uuid];
+            let extensionDir = oldExtension.dir;
+
+            if (!ExtensionSystem.unloadExtension(oldExtension))
+                return;
+
+            FileUtils.recursivelyMoveDir(extensionDir, oldExtensionTmpDir);
+            FileUtils.recursivelyMoveDir(newExtensionTmpDir, extensionDir);
+
+            let extension = ExtensionUtils.createExtensionObject(uuid, extensionDir, ExtensionUtils.ExtensionType.PER_USER);
+
+            try {
+                ExtensionSystem.loadExtension(extension);
+            } catch(e) {
+                ExtensionSystem.unloadExtension(extension);
+
+                logError(e, 'Error loading extension %s'.format(uuid));
+
+                FileUtils.recursivelyDeleteDir(extensionDir, false);
+                FileUtils.recursivelyMoveDir(oldExtensionTmpDir, extensionDir);
+
+                // Restore what was there before. We can't do much if we
+                // fail here.
+                ExtensionSystem.loadExtension(oldExtension);
+                return;
+            }
+
+            FileUtils.recursivelyDeleteDir(oldExtensionTmpDir, true);
+        }, function(code, message) {
+            log('Error while updating extension %s: %s (%s)'.format(uuid, code, message ? message : ''));
+        });
+    }));
+}
+
+function checkForUpdates() {
+    let metadatas = {};
+    for (let uuid in ExtensionUtils.extensions) {
+        metadatas[uuid] = ExtensionUtils.extensions[uuid].metadata;
+    }
+
+    let params = { shell_version: Config.PACKAGE_VERSION,
+                   installed: JSON.stringify(metadatas) };
+
+    let url = REPOSITORY_URL_UPDATE;
+    let message = Soup.form_request_new_from_hash('GET', url, params);
+    _httpSession.queue_message(message, function(session, message) {
+        if (message.status_code != Soup.KnownStatusCode.OK)
+            return;
+
+        let operations = JSON.parse(message.response_body.data);
+        for (let uuid in operations) {
+            let operation = operations[uuid];
+            if (operation == 'blacklist')
+                uninstallExtension(uuid);
+            else if (operation == 'upgrade' || operation == 'downgrade')
+                updateExtension(uuid);
+        }
+    });
+}
+
+const InstallExtensionDialog = new Lang.Class({
+    Name: 'InstallExtensionDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(uuid, info, invocation) {
+        this.parent({ styleClass: 'extension-dialog' });
+
+        this._uuid = uuid;
+        this._info = info;
+        this._invocation = invocation;
+
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this._onCancelButtonPressed),
+                           key:    Clutter.Escape
+                         },
+                         { label:  _("Install"),
+                           action: Lang.bind(this, this._onInstallButtonPressed),
+                           default: true
+                         }]);
+
+        let message = _("Download and install '%s' from extensions.gnome.org?").format(info.name);
+
+        let box = new St.BoxLayout();
+        this.contentLayout.add(box);
+
+        let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
+        let icon = new St.Icon({ gicon: gicon });
+        box.add(icon);
+
+        let label = new St.Label({ text: message });
+        box.add(label);
+    },
+
+    _onCancelButtonPressed: function(button, event) {
+        this.close(global.get_current_time());
+        this._invocation.return_value(GLib.Variant.new('(s)', ['cancelled']));
+    },
+
+    _onInstallButtonPressed: function(button, event) {
+        let params = { shell_version: Config.PACKAGE_VERSION };
+
+        let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
+        let message = Soup.form_request_new_from_hash('GET', url, params);
+
+        let uuid = this._uuid;
+        let dir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
+        let invocation = this._invocation;
+        function errback(code, message) {
+            invocation.return_dbus_error('org.gnome.Shell.' + code, message ? message.toString() : '');
+        }
+
+        function callback() {
+            // Add extension to 'enabled-extensions' for the user, always...
+            let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+            if (enabledExtensions.indexOf(uuid) == -1) {
+                enabledExtensions.push(uuid);
+                global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+            }
+
+            let extension = ExtensionUtils.createExtensionObject(uuid, dir, ExtensionUtils.ExtensionType.PER_USER);
+
+            try {
+                ExtensionSystem.loadExtension(extension);
+            } catch(e) {
+                uninstallExtension(uuid);
+                errback('LoadExtensionError', e);
+                return;
+            }
+
+            invocation.return_value(GLib.Variant.new('(s)', 'successful'));
+        }
+
+        _httpSession.queue_message(message, Lang.bind(this, function(session, message) {
+            gotExtensionZipFile(session, message, uuid, dir, callback, errback);
+        }));
+
+        this.close(global.get_current_time());
+    }
+});
+
+function init() {
+    _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });
+
+    // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
+    // _httpSession.add_feature(new Soup.ProxyResolverDefault());
+    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
+}

js/ui/extensionSystem.js

@@ -3,18 +3,12 @@
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Soup = imports.gi.Soup;
 
-const Config = imports.misc.config;
+const ExtensionUtils = imports.misc.extensionUtils;
-const FileUtils = imports.misc.fileUtils;
+const Main = imports.ui.main;
-const ModalDialog = imports.ui.modalDialog;
-
-const API_VERSION = 1;
 
 const ExtensionState = {
     ENABLED: 1,
@@ -29,47 +23,10 @@ const ExtensionState = {
     UNINSTALLED: 99
 };
 
-const ExtensionType = {
-    SYSTEM: 1,
-    PER_USER: 2
-};
-
-const REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
-const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
-const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
-
-const _httpSession = new Soup.SessionAsync();
-
-// The unfortunate state of gjs, gobject-introspection and libsoup
-// means that I have to do a hack to add a feature.
-// See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
-
-if (Soup.Session.prototype.add_feature != null)
-    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
-
-function _getCertFile() {
-    let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
-    if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
-        return localCert;
-    else
-        return Config.SHELL_SYSTEM_CA_FILE;
-}
-
-_httpSession.ssl_ca_file = _getCertFile();
-
-// Maps uuid -> metadata object
-const extensionMeta = {};
-// Maps uuid -> importer object (extension directory tree)
-const extensions = {};
-// Maps uuid -> extension state object (returned from init())
-const extensionStateObjs = {};
-// Contains the order that extensions were enabled in.
-const extensionOrder = [];
-
 // Arrays of uuids
 var enabledExtensions;
-// GFile for user extensions
+// Contains the order that extensions were enabled in.
-var userExtensionsDir = null;
+const extensionOrder = [];
 
 // We don't really have a class to add signals on. So, create
 // a simple dummy object, add the signal methods, and export those
@@ -80,142 +37,19 @@ Signals.addSignalMethods(_signals);
 const connect = Lang.bind(_signals, _signals.connect);
 const disconnect = Lang.bind(_signals, _signals.disconnect);
 
-// UUID => Array of error messages
-var errors = {};
-
 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';
 
-/**
+var initted = false;
- * versionCheck:
+var enabled;
- * @required: an array of versions we're compatible with
- * @current: the version we have
- *
- * Check if a component is compatible for an extension.
- * @required is an array, and at least one version must match.
- * @current must be in the format <major>.<minor>.<point>.<micro>
- * <micro> is always ignored
- * <point> is ignored if <minor> is even (so you can target the
- * whole stable release)
- * <minor> and <major> must match
- * Each target version must be at least <major> and <minor>
- */
-function versionCheck(required, current) {
-    let currentArray = current.split('.');
-    let major = currentArray[0];
-    let minor = currentArray[1];
-    let point = currentArray[2];
-    for (let i = 0; i < required.length; i++) {
-        let requiredArray = required[i].split('.');
-        if (requiredArray[0] == major &&
-            requiredArray[1] == minor &&
-            (requiredArray[2] == point ||
-             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
-            return true;
-    }
-    return false;
-}
-
-function installExtensionFromUUID(uuid, version_tag) {
-    let params = { uuid: uuid,
-                   version_tag: version_tag,
-                   shell_version: Config.PACKAGE_VERSION,
-                   api_version: API_VERSION.toString() };
-
-    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
-
-    _httpSession.queue_message(message,
-                               function(session, message) {
-                                   let info = JSON.parse(message.response_body.data);
-                                   let dialog = new InstallExtensionDialog(uuid, version_tag, info.name);
-                                   dialog.open(global.get_current_time());
-                               });
-}
-
-function uninstallExtensionFromUUID(uuid) {
-    let meta = extensionMeta[uuid];
-    if (!meta)
-        return false;
-
-    // Try to disable it -- if it's ERROR'd, we can't guarantee that,
-    // but it will be removed on next reboot, and hopefully nothing
-    // broke too much.
-    disableExtension(uuid);
-
-    // Don't try to uninstall system extensions
-    if (meta.type != ExtensionType.PER_USER)
-        return false;
-
-    meta.state = ExtensionState.UNINSTALLED;
-    _signals.emit('extension-state-changed', meta);
-
-    delete extensionMeta[uuid];
-
-    // Importers are marked as PERMANENT, so we can't do this.
-    // delete extensions[uuid];
-    extensions[uuid] = undefined;
-
-    delete extensionStateObjs[uuid];
-    delete errors[uuid];
-
-    FileUtils.recursivelyDeleteDir(Gio.file_new_for_path(meta.path));
-
-    return true;
-}
-
-function gotExtensionZipFile(session, message, uuid) {
-    if (message.status_code != Soup.KnownStatusCode.OK) {
-        logExtensionError(uuid, 'downloading extension: ' + message.status_code);
-        return;
-    }
-
-    // FIXME: use a GFile mkstemp-type method once one exists
-    let fd, tmpzip;
-    try {
-        [fd, tmpzip] = GLib.file_open_tmp('XXXXXX.shell-extension.zip');
-    } catch (e) {
-        logExtensionError(uuid, 'tempfile: ' + e.toString());
-        return;
-    }
-
-    let stream = new Gio.UnixOutputStream({ fd: fd });
-    let dir = userExtensionsDir.get_child(uuid);
-    Shell.write_soup_message_to_stream(stream, message);
-    stream.close(null);
-    let [success, pid] = GLib.spawn_async(null,
-                                          ['unzip', '-uod', dir.get_path(), '--', tmpzip],
-                                          null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
-
-    if (!success) {
-        logExtensionError(uuid, 'extract: could not extract');
-        return;
-    }
-
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function(pid, status) {
-        GLib.spawn_close_pid(pid);
-
-        // Add extension to 'enabled-extensions' for the user, always...
-        let enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-        if (enabledExtensions.indexOf(uuid) == -1) {
-            enabledExtensions.push(uuid);
-            global.settings.set_strv(ENABLED_EXTENSIONS_KEY, enabledExtensions);
-        }
-
-        loadExtension(dir, true, ExtensionType.PER_USER);
-    });
-}
 
 function disableExtension(uuid) {
-    let meta = extensionMeta[uuid];
+    let extension = ExtensionUtils.extensions[uuid];
-    if (!meta)
+    if (!extension)
         return;
 
-    if (meta.state != ExtensionState.ENABLED)
+    if (extension.state != ExtensionState.ENABLED)
         return;
 
-    let extensionState = extensionStateObjs[uuid];
-
     // "Rebase" the extension order by disabling and then enabling extensions
     // in order to help prevent conflicts.
 
@@ -231,217 +65,177 @@ function disableExtension(uuid) {
     for (let i = 0; i < orderReversed.length; i++) {
         let uuid = orderReversed[i];
         try {
-            extensionStateObjs[uuid].disable();
+            ExtensionUtils.extensions[uuid].stateObj.disable();
         } catch(e) {
-            logExtensionError(uuid, e.toString());
+            logExtensionError(uuid, e);
         }
     }
 
-    try {
+    if (extension.stylesheet) {
-        extensionState.disable();
+        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-    } catch(e) {
+        theme.unload_stylesheet(extension.stylesheet.get_path());
-        logExtensionError(uuid, e.toString());
-        return;
     }
 
+    extension.stateObj.disable();
+
     for (let i = 0; i < order.length; i++) {
         let uuid = order[i];
         try {
-            extensionStateObjs[uuid].enable();
+            ExtensionUtils.extensions[uuid].stateObj.enable();
         } catch(e) {
-            logExtensionError(uuid, e.toString());
+            logExtensionError(uuid, e);
         }
     }
 
     extensionOrder.splice(orderIdx, 1);
 
-    meta.state = ExtensionState.DISABLED;
+    extension.state = ExtensionState.DISABLED;
-    _signals.emit('extension-state-changed', meta);
+    _signals.emit('extension-state-changed', extension);
 }
 
 function enableExtension(uuid) {
-    let meta = extensionMeta[uuid];
+    let extension = ExtensionUtils.extensions[uuid];
-    if (!meta)
+    if (!extension)
         return;
 
-    if (meta.state == ExtensionState.INITIALIZED) {
+    if (extension.state == ExtensionState.INITIALIZED)
-        loadExtension(meta.dir, meta.type, true);
+        initExtension(uuid);
-        return;
-    }
 
-    if (meta.state != ExtensionState.DISABLED)
+    if (extension.state != ExtensionState.DISABLED)
         return;
 
-    let extensionState = extensionStateObjs[uuid];
-
     extensionOrder.push(uuid);
 
-    try {
+    let stylesheetFile = extension.dir.get_child('stylesheet.css');
-        extensionState.enable();
+    if (stylesheetFile.query_exists(null)) {
-    } catch(e) {
+        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        logExtensionError(uuid, e.toString());
+        theme.load_stylesheet(stylesheetFile.get_path());
-        return;
+        extension.stylesheet = stylesheetFile;
     }
 
-    meta.state = ExtensionState.ENABLED;
+    extension.stateObj.enable();
-    _signals.emit('extension-state-changed', meta);
+
+    extension.state = ExtensionState.ENABLED;
+    _signals.emit('extension-state-changed', extension);
 }
 
-function logExtensionError(uuid, message, state) {
+function logExtensionError(uuid, error) {
-    if (!errors[uuid]) errors[uuid] = [];
+    let extension = ExtensionUtils.extensions[uuid];
-    errors[uuid].push(message);
+    if (!extension)
-    global.logError('Extension "%s" had error: %s'.format(uuid, message));
+        return;
-    state = state || ExtensionState.ERROR;
+
+    let message = '' + error;
+
+    extension.state = ExtensionState.ERROR;
+    if (!extension.errors)
+        extension.errors = [];
+    extension.errors.push(message);
+
+    log('Extension "%s" had error: %s'.format(uuid, message));
     _signals.emit('extension-state-changed', { uuid: uuid,
                                                error: message,
-                                               state: state });
+                                               state: extension.state });
 }
 
-function loadExtension(dir, type, enabled) {
+function loadExtension(extension) {
-    let info;
+    // Default to error, we set success as the last step
-    let uuid = dir.get_basename();
+    extension.state = ExtensionState.ERROR;
 
-    let metadataFile = dir.get_child('metadata.json');
+    if (ExtensionUtils.isOutOfDate(extension)) {
-    if (!metadataFile.query_exists(null)) {
+        extension.state = ExtensionState.OUT_OF_DATE;
-        logExtensionError(uuid, 'Missing metadata.json');
+    } else {
-        return;
+        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
-    }
+        if (enabled) {
-
+            initExtension(extension.uuid);
-    let metadataContents;
+            if (extension.state == ExtensionState.DISABLED)
-    try {
+                enableExtension(extension.uuid);
-        metadataContents = Shell.get_file_contents_utf8_sync(metadataFile.get_path());
+        } else {
-    } catch (e) {
+            extension.state = ExtensionState.INITIALIZED;
-        logExtensionError(uuid, 'Failed to load metadata.json: ' + e);
-        return;
-    }
-    let meta;
-    try {
-        meta = JSON.parse(metadataContents);
-    } catch (e) {
-        logExtensionError(uuid, 'Failed to parse metadata.json: ' + e);
-        return;
-    }
-
-    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
-    for (let i = 0; i < requiredProperties.length; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            logExtensionError(uuid, 'missing "' + prop + '" property in metadata.json');
-            return;
         }
     }
 
-    if (extensions[uuid] != undefined) {
+    _signals.emit('extension-state-changed', extension);
-        logExtensionError(uuid, 'extension already loaded');
+}
-        return;
-    }
 
-    // Encourage people to add this
+function unloadExtension(extension) {
-    if (!meta['url']) {
+    // Try to disable it -- if it's ERROR'd, we can't guarantee that,
-        global.log('Warning: Missing "url" property in metadata.json');
+    // but it will be removed on next reboot, and hopefully nothing
-    }
+    // broke too much.
+    disableExtension(extension.uuid);
 
-    if (uuid != meta.uuid) {
+    extension.state = ExtensionState.UNINSTALLED;
-        logExtensionError(uuid, 'uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
+    _signals.emit('extension-state-changed', extension);
-        return;
-    }
 
-    extensionMeta[uuid] = meta;
+    delete ExtensionUtils.extensions[extension.uuid];
-    meta.type = type;
+    return true;
-    meta.dir = dir;
+}
-    meta.path = dir.get_path();
-    meta.error = '';
 
-    // Default to error, we set success as the last step
+function reloadExtension(oldExtension) {
-    meta.state = ExtensionState.ERROR;
+    // Grab the things we'll need to pass to createExtensionObject
+    // to reload it.
+    let { uuid: uuid, dir: dir, type: type } = oldExtension;
 
-    if (!versionCheck(meta['shell-version'], Config.PACKAGE_VERSION) ||
+    // Then unload the old extension.
-        (meta['js-version'] && !versionCheck(meta['js-version'], Config.GJS_VERSION))) {
+    unloadExtension(oldExtension);
-        logExtensionError(uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
-        meta.state = ExtensionState.OUT_OF_DATE;
-        return;
-    }
 
-    if (!enabled) {
+    // Now, recreate the extension and load it.
-        meta.state = ExtensionState.INITIALIZED;
+    let newExtension = ExtensionUtils.createExtensionObject(uuid, dir, type);
-        return;
+    loadExtension(newExtension);
-    }
+}
+
+function initExtension(uuid) {
+    let extension = ExtensionUtils.extensions[uuid];
+    let dir = extension.dir;
+
+    if (!extension)
+        throw new Error("Extension was not properly created. Call loadExtension first");
 
     let extensionJs = dir.get_child('extension.js');
-    if (!extensionJs.query_exists(null)) {
+    if (!extensionJs.query_exists(null))
-        logExtensionError(uuid, 'Missing extension.js');
+        throw new Error('Missing extension.js');
-        return;
-    }
-    let stylesheetPath = null;
-    let themeContext = St.ThemeContext.get_for_stage(global.stage);
-    let theme = themeContext.get_theme();
-    let stylesheetFile = dir.get_child('stylesheet.css');
-    if (stylesheetFile.query_exists(null)) {
-        try {
-            theme.load_stylesheet(stylesheetFile.get_path());
-        } catch (e) {
-            logExtensionError(uuid, 'Stylesheet parse error: ' + e);
-            return;
-        }
-    }
 
     let extensionModule;
     let extensionState = null;
-    try {
-        global.add_extension_importer('imports.ui.extensionSystem.extensions', meta.uuid, dir.get_path());
-        extensionModule = extensions[meta.uuid].extension;
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        logExtensionError(uuid, e);
-        return;
-    }
 
-    if (!extensionModule.init) {
+    ExtensionUtils.installImporter(extension);
-        logExtensionError(uuid, 'missing \'init\' function');
+    extensionModule = extension.imports.extension;
-        return;
-    }
 
-    try {
+    if (extensionModule.init) {
-        extensionState = extensionModule.init(meta);
+        extensionState = extensionModule.init(extension);
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        logExtensionError(uuid, 'Failed to evaluate init function:' + e);
-        return;
     }
 
     if (!extensionState)
         extensionState = extensionModule;
-    extensionStateObjs[uuid] = extensionState;
+    extension.stateObj = extensionState;
 
-    if (!extensionState.enable) {
+    extension.state = ExtensionState.DISABLED;
-        logExtensionError(uuid, 'missing \'enable\' function');
+    _signals.emit('extension-loaded', uuid);
-        return;
+}
-    }
-    if (!extensionState.disable) {
-        logExtensionError(uuid, 'missing \'disable\' function');
-        return;
-    }
 
-    meta.state = ExtensionState.DISABLED;
+function getEnabledExtensions() {
+    let extensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
+    if (!Array.isArray(Main.sessionMode.enabledExtensions))
+        return extensions;
 
-    enableExtension(uuid);
+    return Main.sessionMode.enabledExtensions.concat(extensions);
-
-    _signals.emit('extension-loaded', meta.uuid);
-    _signals.emit('extension-state-changed', meta);
-    global.log('Loaded extension ' + meta.uuid);
 }
 
 function onEnabledExtensionsChanged() {
-    let newEnabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
+    let newEnabledExtensions = getEnabledExtensions();
+
+    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) {
         return enabledExtensions.indexOf(uuid) == -1;
     }).forEach(function(uuid) {
-        enableExtension(uuid);
+        try {
+            enableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
     });
 
     // Find and disable all the newly disabled extensions: UUIDs found in the
@@ -449,125 +243,74 @@ function onEnabledExtensionsChanged() {
     enabledExtensions.filter(function(item) {
         return newEnabledExtensions.indexOf(item) == -1;
     }).forEach(function(uuid) {
-        disableExtension(uuid);
+        try {
+            disableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
     });
 
     enabledExtensions = newEnabledExtensions;
 }
 
-function init() {
+function _loadExtensions() {
-    let userExtensionsPath = GLib.build_filenamev([global.userdatadir, 'extensions']);
-    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
-    try {
-        if (!userExtensionsDir.query_exists(null))
-            userExtensionsDir.make_directory_with_parents(null);
-    } catch (e) {
-        global.logError('' + e);
-    }
-
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
-    enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
+    enabledExtensions = getEnabledExtensions();
+
+    let finder = new ExtensionUtils.ExtensionFinder();
+    finder.connect('extension-found', function(signals, extension) {
+        try {
+            loadExtension(extension);
+        } catch(e) {
+            logExtensionError(extension.uuid, e);
+        }
+    });
+    finder.scanExtensions();
 }
 
-function _loadExtensionsIn(dir, type) {
+function enableAllExtensions() {
-    let fileEnum;
+    if (enabled)
-    let file, info;
+        return;
-    try {
-        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-    } catch (e) {
-        global.logError('' + e);
-       return;
-    }
 
-    while ((info = fileEnum.next_file(null)) != null) {
+    if (!initted) {
-        let fileType = info.get_file_type();
+        _loadExtensions();
-        if (fileType != Gio.FileType.DIRECTORY)
+        initted = true;
-            continue;
+    } else {
-        let name = info.get_name();
+        enabledExtensions.forEach(function(uuid) {
-        let child = dir.get_child(name);
+            enableExtension(uuid);
-        let enabled = enabledExtensions.indexOf(name) != -1;
+        });
-        loadExtension(child, type, enabled);
     }
-    fileEnum.close(null);
+    enabled = true;
 }
 
-function loadExtensions() {
+function disableAllExtensions() {
-    let systemDataDirs = GLib.get_system_data_dirs();
+    if (!enabled)
-    for (let i = 0; i < systemDataDirs.length; i++) {
+        return;
-        let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
+
-        let dir = Gio.file_new_for_path(dirPath);
+    if (initted) {
-        if (dir.query_exists(null))
+        enabledExtensions.forEach(function(uuid) {
-            _loadExtensionsIn(dir, ExtensionType.SYSTEM);
+            disableExtension(uuid);
+        });
     }
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
+
+    enabled = false;
 }
 
-function InstallExtensionDialog(uuid, version_tag, name) {
+function _sessionUpdated() {
-    this._init(uuid, version_tag, name);
+    // For now sessionMode.allowExtensions controls extensions from both the
+    // 'enabled-extensions' preference and the sessionMode.enabledExtensions
+    // property; it might make sense to make enabledExtensions independent
+    // from allowExtensions in the future
+    if (Main.sessionMode.allowExtensions) {
+        if (initted)
+            onEnabledExtensionsChanged();
+        enableAllExtensions();
+    } else {
+        disableAllExtensions();
+    }
 }
 
-InstallExtensionDialog.prototype = {
+function init() {
-    __proto__: ModalDialog.ModalDialog.prototype,
+    Main.sessionMode.connect('updated', _sessionUpdated);
-
+    _sessionUpdated();
-    _init: function(uuid, version_tag, name) {
+}
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'extension-dialog' });
-
-        this._uuid = uuid;
-        this._version_tag = version_tag;
-        this._name = name;
-
-        this.setButtons([{ label: _("Cancel"),
-                           action: Lang.bind(this, this._onCancelButtonPressed),
-                           key:    Clutter.Escape
-                         },
-                         { label:  _("Install"),
-                           action: Lang.bind(this, this._onInstallButtonPressed)
-                         }]);
-
-        let message = _("Download and install '%s' from extensions.gnome.org?").format(name);
-
-        this._descriptionLabel = new St.Label({ text: message });
-
-        this.contentLayout.add(this._descriptionLabel,
-                               { y_fill:  true,
-                                 y_align: St.Align.START });
-    },
-
-    _onCancelButtonPressed: function(button, event) {
-        this.close(global.get_current_time());
-
-        // Even though the extension is already "uninstalled", send through
-        // a state-changed signal for any users who want to know if the install
-        // went through correctly -- using proper async DBus would block more
-        // traditional clients like the plugin
-        let meta = { uuid: this._uuid,
-                     state: ExtensionState.UNINSTALLED,
-                     error: '' };
-
-        _signals.emit('extension-state-changed', meta);
-    },
-
-    _onInstallButtonPressed: function(button, event) {
-        let meta = { uuid: this._uuid,
-                     state: ExtensionState.DOWNLOADING,
-                     error: '' };
-
-        extensionMeta[this._uuid] = meta;
-
-        _signals.emit('extension-state-changed', meta);
-
-        let params = { version_tag: this._version_tag,
-                       shell_version: Config.PACKAGE_VERSION,
-                       api_version: API_VERSION.toString() };
-
-        let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
-        let message = Soup.form_request_new_from_hash('GET', url, params);
-
-        _httpSession.queue_message(message,
-                                   Lang.bind(this, function(session, message) {
-                                       gotExtensionZipFile(session, message, this._uuid);
-                                   }));
-
-        this.close(global.get_current_time());
-    }
-};

js/ui/flashspot.js

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

js/ui/grabHelper.js

@@ -0,0 +1,366 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+
+function _navigateActor(actor) {
+    if (!actor)
+        return;
+
+    let needsGrab = true;
+    if (actor instanceof St.Widget)
+        needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+    if (needsGrab)
+        actor.grab_key_focus();
+}
+
+// GrabHelper:
+// @owner: the actor that owns the GrabHelper
+// @params: optional parameters to pass to Main.pushModal()
+//
+// Creates a new GrabHelper object, for dealing with keyboard and pointer grabs
+// associated with a set of actors.
+//
+// Note that the grab can be automatically dropped at any time by the user, and
+// your code just needs to deal with it; you shouldn't adjust behavior directly
+// after you call ungrab(), but instead pass an 'onUngrab' callback when you
+// call grab().
+const GrabHelper = new Lang.Class({
+    Name: 'GrabHelper',
+
+    _init: function(owner, params) {
+        this._owner = owner;
+        this._modalParams = params;
+
+        this._grabStack = [];
+
+        this._actors = [];
+        this._capturedEventId = 0;
+        this._keyFocusNotifyId = 0;
+        this._focusWindowChangedId = 0;
+        this._ignoreRelease = false;
+
+        this._modalCount = 0;
+        this._grabFocusCount = 0;
+    },
+
+    // addActor:
+    // @actor: an actor
+    //
+    // Adds @actor to the set of actors that are allowed to process events
+    // during a grab.
+    addActor: function(actor) {
+        actor.__grabHelperDestroyId = actor.connect('destroy', Lang.bind(this, function() { this.removeActor(actor); }));
+        this._actors.push(actor);
+    },
+
+    // removeActor:
+    // @actor: an actor
+    //
+    // Removes @actor from the set of actors that are allowed to
+    // process events during a grab.
+    removeActor: function(actor) {
+        let index = this._actors.indexOf(actor);
+        if (index != -1)
+            this._actors.splice(index, 1);
+        if (actor.__grabHelperDestroyId) {
+            actor.disconnect(actor.__grabHelperDestroyId);
+            delete actor.__grabHelperDestroyId;
+        }
+    },
+
+    _isWithinGrabbedActor: function(actor) {
+       let currentActor = this.currentGrab.actor;
+        while (actor) {
+            if (this._actors.indexOf(actor) != -1)
+                return true;
+            if (actor == currentActor)
+                return true;
+            actor = actor.get_parent();
+        }
+        return false;
+    },
+
+    get currentGrab() {
+        return this._grabStack[this._grabStack.length - 1] || {};
+    },
+
+    get grabbed() {
+        return this._grabStack.length > 0;
+    },
+
+    get grabStack() {
+        return this._grabStack;
+    },
+
+    _findStackIndex: function(actor) {
+        if (!actor)
+            return -1;
+
+        for (let i = 0; i < this._grabStack.length; i++) {
+            if (this._grabStack[i].actor === actor)
+                return i;
+        }
+        return -1;
+    },
+
+    _actorInGrabStack: function(actor) {
+        while (actor) {
+            let idx = this._findStackIndex(actor);
+            if (idx >= 0)
+                return idx;
+            actor = actor.get_parent();
+        }
+        return -1;
+    },
+
+    isActorGrabbed: function(actor) {
+        return this._findStackIndex(actor) >= 0;
+    },
+
+    // grab:
+    // @params: A bunch of parameters, see below
+    //
+    // Grabs the mouse and keyboard, according to the GrabHelper's
+    // parameters. If @newFocus is not %null, then the keyboard focus
+    // is moved to the first #StWidget:can-focus widget inside it.
+    //
+    // The grab will automatically be dropped if:
+    //   - The user clicks outside the grabbed actors
+    //   - The user types Escape
+    //   - The keyboard focus is moved outside the grabbed actors
+    //   - A window is focused
+    //
+    // If @params.actor is not null, then it will be focused as the
+    // new actor. If you attempt to grab an already focused actor, the
+    // request to be focused will be ignored. The actor will not be
+    // added to the grab stack, so do not call a paired ungrab().
+    //
+    // If @params contains { modal: true }, then grab() will push a modal
+    // on the owner of the GrabHelper. As long as there is at least one
+    // { modal: true } actor on the grab stack, the grab will be kept.
+    // When the last { modal: true } actor is ungrabbed, then the modal
+    // will be dropped. A modal grab can fail if there is already a grab
+    // in effect from aother application; in this case the function returns
+    // false and nothing happens. Non-modal grabs can never fail.
+    //
+    // If @params contains { grabFocus: true }, then if you call grab()
+    // while the shell is outside the overview, it will set the stage
+    // input mode to %Shell.StageInputMode.FOCUSED, and ungrab() will
+    // revert it back, and re-focus the previously-focused window (if
+    // another window hasn't been explicitly focused before then).
+    grab: function(params) {
+        params = Params.parse(params, { actor: null,
+                                        modal: false,
+                                        grabFocus: false,
+                                        focus: null,
+                                        onUngrab: null });
+
+        let focus = global.stage.key_focus;
+        let hadFocus = focus && this._isWithinGrabbedActor(focus);
+        let newFocus = params.actor;
+
+        if (this.isActorGrabbed(params.actor))
+            return true;
+
+        params.savedFocus = focus;
+
+        if (params.modal && !this._takeModalGrab())
+            return false;
+
+        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
+            return false;
+
+        if (params.focus)
+            params.focus.grab_key_focus();
+        else if (hadFocus || params.grabFocus)
+            _navigateActor(newFocus);
+
+        this._grabStack.push(params);
+        return true;
+    },
+
+    _takeModalGrab: function() {
+        let firstGrab = (this._modalCount == 0);
+        if (firstGrab) {
+            if (!Main.pushModal(this._owner, this._modalParams))
+                return false;
+
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        }
+
+        this._modalCount++;
+        return true;
+    },
+
+    _releaseModalGrab: function() {
+        this._modalCount--;
+        if (this._modalCount > 0)
+            return;
+
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 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;
+
+            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
+                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+            }
+
+            this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
+            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
+        }
+
+        this._grabFocusCount++;
+        return true;
+    },
+
+    _releaseFocusGrab: function() {
+        this._grabFocusCount--;
+        if (this._grabFocusCount > 0)
+            return;
+
+        if (this._keyFocusNotifyId > 0) {
+            global.stage.disconnect(this._keyFocusNotifyId);
+            this._keyFocusNotifyId = 0;
+        }
+
+        if (!this._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);
+        }
+
+        global.screen.focus_default_window(global.get_current_time());
+    },
+
+    // ignoreRelease:
+    //
+    // Make sure that the next button release event evaluated by the
+    // capture event handler returns false. This is designed for things
+    // like the ComboBoxMenu that go away on press, but need to eat
+    // the next release event.
+    ignoreRelease: function() {
+        this._ignoreRelease = true;
+    },
+
+    // ungrab:
+    // @params: The parameters for the grab; see below.
+    //
+    // Pops an actor from the grab stack, potentially dropping the grab.
+    //
+    // If the actor that was popped from the grab stack was not the actor
+    // That was passed in, this call is ignored.
+    ungrab: function(params) {
+        params = Params.parse(params, { actor: this.currentGrab.actor,
+                                        isUser: false });
+
+        let grabStackIndex = this._findStackIndex(params.actor);
+        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;
+
+        for (let i = poppedGrabs.length - 1; i >= 0; i--) {
+            let poppedGrab = poppedGrabs[i];
+
+            if (poppedGrab.onUngrab)
+                poppedGrab.onUngrab(params.isUser);
+
+            if (poppedGrab.modal)
+                this._releaseModalGrab();
+
+            if (poppedGrab.grabFocus)
+                this._releaseFocusGrab();
+        }
+
+        if (hadFocus) {
+            let poppedGrab = poppedGrabs[0];
+            _navigateActor(poppedGrab.savedFocus);
+        }
+    },
+
+    _onCapturedEvent: function(actor, event) {
+        let type = event.type();
+        let press = type == Clutter.EventType.BUTTON_PRESS;
+        let release = type == Clutter.EventType.BUTTON_RELEASE;
+        let button = press || release;
+
+        if (release && this._ignoreRelease) {
+            this._ignoreRelease = false;
+            return true;
+        }
+
+        if (!button && this._modalCount == 0)
+            return false;
+
+        if (type == Clutter.EventType.KEY_PRESS &&
+            event.get_key_symbol() == Clutter.KEY_Escape) {
+            this.ungrab({ isUser: true });
+            return true;
+        }
+
+        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;
+            let i = this._actorInGrabStack(event.get_source()) + 1;
+            this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
+        }
+
+        return this._modalCount > 0;
+    },
+
+    _onKeyFocusChanged: function() {
+        let focus = global.stage.key_focus;
+        if (!focus || !this._isWithinGrabbedActor(focus))
+            this.ungrab({ isUser: true });
+    },
+
+    _focusWindowChanged: function() {
+        let metaDisplay = global.screen.get_display();
+        if (metaDisplay.focus_window != null)
+            this.ungrab({ isUser: true });
+    }
+});

js/ui/ibusCandidatePopup.js

@@ -0,0 +1,228 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const IBus = imports.gi.IBus;
+const Lang = imports.lang;
+const St = imports.gi.St;
+
+const BoxPointer = imports.ui.boxpointer;
+const Main = imports.ui.main;
+const PopupMenu = imports.ui.popupMenu;
+
+const MAX_CANDIDATES_PER_PAGE = 16;
+
+const CandidateArea = new Lang.Class({
+    Name: 'CandidateArea',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function() {
+        this.parent({ reactive: false });
+
+        // St.Table exhibits some sizing problems so let's go with a
+        // clutter layout manager for now.
+        this._table = new Clutter.Actor();
+        this.addActor(this._table);
+
+        this._tableLayout = new Clutter.TableLayout();
+        this._table.set_layout_manager(this._tableLayout);
+
+        this._indexLabels = [];
+        this._candidateLabels = [];
+        for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+            this._indexLabels.push(new St.Label({ style_class: 'candidate-index' }));
+            this._candidateLabels.push(new St.Label({ style_class: 'candidate-label' }));
+        }
+
+        this._orientation = -1;
+        this._cursorPosition = 0;
+    },
+
+    _setOrientation: function(orientation) {
+        if (this._orientation == orientation)
+            return;
+
+        this._orientation = orientation;
+
+        this._table.remove_all_children();
+
+        if (this._orientation == IBus.Orientation.HORIZONTAL)
+            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+                this._tableLayout.pack(this._indexLabels[i], i*2, 0);
+                this._tableLayout.pack(this._candidateLabels[i], i*2 + 1, 0);
+            }
+        else                    // VERTICAL || SYSTEM
+            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+                this._tableLayout.pack(this._indexLabels[i], 0, i);
+                this._tableLayout.pack(this._candidateLabels[i], 1, i);
+            }
+    },
+
+    setCandidates: function(indexes, candidates, orientation, cursorPosition, cursorVisible) {
+        this._setOrientation(orientation);
+
+        for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
+            let visible = i < candidates.length;
+            this._indexLabels[i].visible = visible;
+            this._candidateLabels[i].visible = visible;
+
+            if (!visible)
+                continue;
+
+            this._indexLabels[i].text = ((indexes && indexes[i]) ? indexes[i] : '%x.'.format(i + 1));
+            this._candidateLabels[i].text = candidates[i];
+        }
+
+        this._candidateLabels[this._cursorPosition].remove_style_pseudo_class('selected');
+        this._cursorPosition = cursorPosition;
+        if (cursorVisible)
+            this._candidateLabels[cursorPosition].add_style_pseudo_class('selected');
+    },
+});
+
+const CandidatePopup = new Lang.Class({
+    Name: 'CandidatePopup',
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function() {
+        this._cursor = new St.Bin({ opacity: 0 });
+        Main.uiGroup.add_actor(this._cursor);
+
+        this.parent(this._cursor, 0, St.Side.TOP);
+        this.actor.hide();
+        Main.uiGroup.add_actor(this.actor);
+
+        this._preeditTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._preeditTextItem.actor.hide();
+        this.addMenuItem(this._preeditTextItem);
+
+        this._auxTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._auxTextItem.actor.hide();
+        this.addMenuItem(this._auxTextItem);
+
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._lookupTableItem = new CandidateArea();
+        this._lookupTableItem.actor.hide();
+        this.addMenuItem(this._lookupTableItem);
+
+        this._panelService = null;
+    },
+
+    setPanelService: function(panelService) {
+        this._panelService = panelService;
+        if (!panelService)
+            return;
+
+        panelService.connect('set-cursor-location',
+                             Lang.bind(this, function(ps, x, y, w, h) {
+                                 this._cursor.set_position(x, y);
+                                 this._cursor.set_size(w, h);
+                             }));
+        panelService.connect('update-preedit-text',
+                             Lang.bind(this, function(ps, text, cursorPosition, visible) {
+                                 if (visible)
+                                     this._preeditTextItem.actor.show();
+                                 else
+                                     this._preeditTextItem.actor.hide();
+                                 this._updateVisibility();
+
+                                 this._preeditTextItem.actor.label_actor.text = text.get_text();
+
+                                 let attrs = text.get_attributes();
+                                 if (attrs)
+                                     this._setTextAttributes(this._preeditTextItem.actor.label_actor.clutter_text,
+                                                             attrs);
+                             }));
+        panelService.connect('show-preedit-text',
+                             Lang.bind(this, function(ps) {
+                                 this._preeditTextItem.actor.show();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('hide-preedit-text',
+                             Lang.bind(this, function(ps) {
+                                 this._preeditTextItem.actor.hide();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('update-auxiliary-text',
+                             Lang.bind(this, function(ps, text, visible) {
+                                 if (visible)
+                                     this._auxTextItem.actor.show();
+                                 else
+                                     this._auxTextItem.actor.hide();
+                                 this._updateVisibility();
+
+                                 this._auxTextItem.actor.label_actor.text = text.get_text();
+                             }));
+        panelService.connect('show-auxiliary-text',
+                             Lang.bind(this, function(ps) {
+                                 this._auxTextItem.actor.show();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('hide-auxiliary-text',
+                             Lang.bind(this, function(ps) {
+                                 this._auxTextItem.actor.hide();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('update-lookup-table',
+                             Lang.bind(this, function(ps, lookupTable, visible) {
+                                 if (visible)
+                                     this._lookupTableItem.actor.show();
+                                 else
+                                     this._lookupTableItem.actor.hide();
+                                 this._updateVisibility();
+
+                                 let cursorPos = lookupTable.get_cursor_pos();
+                                 let pageSize = lookupTable.get_page_size();
+                                 let page = ((cursorPos == 0) ? 0 : Math.floor(cursorPos / pageSize));
+                                 let startIndex = page * pageSize;
+                                 let endIndex = Math.min((page + 1) * pageSize,
+                                                         lookupTable.get_number_of_candidates());
+                                 let indexes = [];
+                                 let indexLabel;
+                                 for (let i = 0; indexLabel = lookupTable.get_label(i); ++i)
+                                      indexes.push(indexLabel.get_text());
+
+                                 let candidates = [];
+                                 for (let i = startIndex; i < endIndex; ++i)
+                                     candidates.push(lookupTable.get_candidate(i).get_text());
+
+                                 this._lookupTableItem.setCandidates(indexes,
+                                                                     candidates,
+                                                                     lookupTable.get_orientation(),
+                                                                     cursorPos % pageSize,
+                                                                     lookupTable.is_cursor_visible());
+                             }));
+        panelService.connect('show-lookup-table',
+                             Lang.bind(this, function(ps) {
+                                 this._lookupTableItem.actor.show();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('hide-lookup-table',
+                             Lang.bind(this, function(ps) {
+                                 this._lookupTableItem.actor.hide();
+                                 this._updateVisibility();
+                             }));
+        panelService.connect('focus-out',
+                             Lang.bind(this, function(ps) {
+                                 this.close(BoxPointer.PopupAnimation.NONE);
+                             }));
+    },
+
+    _updateVisibility: function() {
+        let isVisible = (this._preeditTextItem.actor.visible ||
+                         this._auxTextItem.actor.visible ||
+                         this._lookupTableItem.actor.visible);
+
+        if (isVisible)
+            this.open(BoxPointer.PopupAnimation.NONE);
+        else
+            this.close(BoxPointer.PopupAnimation.NONE);
+    },
+
+    _setTextAttributes: function(clutterText, ibusAttrList) {
+        let attr;
+        for (let i = 0; attr = ibusAttrList.get(i); ++i)
+            if (attr.get_attr_type() == IBus.AttrType.BACKGROUND)
+                clutterText.set_selection(attr.get_start_index(), attr.get_end_index());
+    }
+});

js/ui/iconGrid.js

@@ -10,11 +10,9 @@ const Params = imports.misc.params;
 const ICON_SIZE = 48;
 
 
-function BaseIcon(label, createIcon) {
+const BaseIcon = new Lang.Class({
-    this._init(label, createIcon);
+    Name: 'BaseIcon',
-}
 
-BaseIcon.prototype = {
     _init : function(label, params) {
         params = Params.parse(params, { createIcon: null,
                                         setSizeManually: false,
@@ -25,6 +23,8 @@ BaseIcon.prototype = {
         this.actor._delegate = this;
         this.actor.connect('style-changed',
                            Lang.bind(this, this._onStyleChanged));
+        this.actor.connect('destroy',
+                           Lang.bind(this, this._onDestroy));
 
         this._spacing = 0;
 
@@ -37,7 +37,8 @@ BaseIcon.prototype = {
         this.actor.set_child(box);
 
         this.iconSize = ICON_SIZE;
-        this._iconBin = new St.Bin();
+        this._iconBin = new St.Bin({ x_align: St.Align.MIDDLE,
+                                     y_align: St.Align.MIDDLE });
 
         box.add_actor(this._iconBin);
 
@@ -53,6 +54,9 @@ BaseIcon.prototype = {
         this._setSizeManually = params.setSizeManually;
 
         this.icon = null;
+
+        let cache = St.TextureCache.get_default();
+        this._iconThemeChangedId = cache.connect('icon-theme-changed', Lang.bind(this, this._onIconThemeChanged));
     },
 
     _allocate: function(actor, box, flags) {
@@ -127,12 +131,12 @@ BaseIcon.prototype = {
         this.iconSize = size;
         this.icon = this.createIcon(this.iconSize);
 
+        this._iconBin.child = this.icon;
+
         // The icon returned by createIcon() might actually be smaller than
         // the requested icon size (for instance StTextureCache does this
         // for fallback icons), so set the size explicitly.
-        this.icon.set_size(this.iconSize, this.iconSize);
+        this._iconBin.set_size(this.iconSize, this.iconSize);
-
-        this._iconBin.child = this.icon;
     },
 
     _onStyleChanged: function() {
@@ -147,15 +151,28 @@ BaseIcon.prototype = {
             size = found ? len : ICON_SIZE;
         }
 
+        if (this.iconSize == size && this._iconBin.child)
+            return;
+
         this._createIconTexture(size);
+    },
+
+    _onDestroy: function() {
+        if (this._iconThemeChangedId > 0) {
+            let cache = St.TextureCache.get_default();
+            cache.disconnect(this._iconThemeChangedId);
+            this._iconThemeChangedId = 0;
+        }
+    },
+
+    _onIconThemeChanged: function() {
+        this._createIconTexture(this.iconSize);
     }
-};
+});
 
-function IconGrid(params) {
+const IconGrid = new Lang.Class({
-    this._init(params);
+    Name: 'IconGrid',
-}
 
-IconGrid.prototype = {
     _init: function(params) {
         params = Params.parse(params, { rowLimit: null,
                                         columnLimit: null,
@@ -168,7 +185,7 @@ IconGrid.prototype = {
                                         vertical: true });
         // Pulled from CSS, but hardcode some defaults here
         this._spacing = 0;
-        this._item_size = ICON_SIZE;
+        this._hItemSize = this._vItemSize = ICON_SIZE;
         this._grid = new Shell.GenericContainer();
         this.actor.add(this._grid, { expand: true, y_align: St.Align.START });
         this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
@@ -187,8 +204,8 @@ IconGrid.prototype = {
         // Kind of a lie, but not really an issue right now.  If
         // we wanted to support some sort of hidden/overflow that would
         // need higher level design
-        alloc.min_size = this._item_size;
+        alloc.min_size = this._hItemSize;
-        alloc.natural_size = nColumns * this._item_size + totalSpacing;
+        alloc.natural_size = nColumns * this._hItemSize + totalSpacing;
     },
 
     _getVisibleChildren: function() {
@@ -201,7 +218,11 @@ IconGrid.prototype = {
 
     _getPreferredHeight: function (grid, forWidth, alloc) {
         let children = this._getVisibleChildren();
-        let [nColumns, usedWidth] = this._computeLayout(forWidth);
+        let nColumns;
+        if (forWidth < 0)
+            nColumns = children.length;
+        else
+            nColumns = this._computeLayout(forWidth)[0];
         let nRows;
         if (nColumns > 0)
             nRows = Math.ceil(children.length / nColumns);
@@ -210,7 +231,7 @@ IconGrid.prototype = {
         if (this._rowLimit)
             nRows = Math.min(nRows, this._rowLimit);
         let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
-        let height = nRows * this._item_size + totalSpacing;
+        let height = nRows * this._vItemSize + totalSpacing;
         alloc.min_size = height;
         alloc.natural_size = height;
     },
@@ -243,13 +264,13 @@ IconGrid.prototype = {
                 = children[i].get_preferred_size();
 
             /* Center the item in its allocation horizontally */
-            let width = Math.min(this._item_size, childNaturalWidth);
+            let width = Math.min(this._hItemSize, childNaturalWidth);
             let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
-            let height = Math.min(this._item_size, childNaturalHeight);
+            let height = Math.min(this._vItemSize, childNaturalHeight);
             let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
 
             let childBox = new Clutter.ActorBox();
-            if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
+            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
                 let _x = box.x2 - (x + width);
                 childBox.x1 = Math.floor(_x - childXSpacing);
             } else {
@@ -273,10 +294,10 @@ IconGrid.prototype = {
             }
 
             if (columnIndex == 0) {
-                y += this._item_size + this._spacing;
+                y += this._vItemSize + this._spacing;
                 x = box.x1 + leftPadding;
             } else {
-                x += this._item_size + this._spacing;
+                x += this._hItemSize + this._spacing;
             }
         }
     },
@@ -285,12 +306,16 @@ IconGrid.prototype = {
         return this._computeLayout(rowWidth)[0];
     },
 
+    getRowLimit: function() {
+        return this._rowLimit;
+    },
+
     _computeLayout: function (forWidth) {
         let nColumns = 0;
         let usedWidth = 0;
         while ((this._colLimit == null || nColumns < this._colLimit) &&
-               (usedWidth + this._item_size <= forWidth)) {
+               (usedWidth + this._hItemSize <= forWidth)) {
-            usedWidth += this._item_size + this._spacing;
+            usedWidth += this._hItemSize + this._spacing;
             nColumns += 1;
         }
 
@@ -303,25 +328,27 @@ IconGrid.prototype = {
     _onStyleChanged: function() {
         let themeNode = this.actor.get_theme_node();
         this._spacing = themeNode.get_length('spacing');
-        this._item_size = themeNode.get_length('-shell-grid-item-size');
+        this._hItemSize = themeNode.get_length('-shell-grid-horizontal-item-size') || ICON_SIZE;
+        this._vItemSize = themeNode.get_length('-shell-grid-vertical-item-size') || ICON_SIZE;
         this._grid.queue_relayout();
     },
 
-    removeAll: function () {
+    removeAll: function() {
-        this._grid.get_children().forEach(Lang.bind(this, function (child) {
+        this._grid.destroy_all_children();
-            child.destroy();
-        }));
     },
 
-    addItem: function(actor) {
+    addItem: function(actor, index) {
-        this._grid.add_actor(actor);
+        if (index !== undefined)
+            this._grid.insert_child_at_index(actor, index);
+        else
+            this._grid.add_actor(actor);
     },
 
     getItemAtIndex: function(index) {
-        return this._grid.get_children()[index];
+        return this._grid.get_child_at_index(index);
     },
 
     visibleItemsCount: function() {
-        return this._grid.get_children().length - this._grid.get_n_skip_paint();
+        return this._grid.get_n_children() - this._grid.get_n_skip_paint();
     }
-};
+});

js/ui/keyboard.js

@@ -20,53 +20,31 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-// Key constants taken from Antler
+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
-// FIXME: ought to be moved into libcaribou
+<method name='Show'>
-const PRETTY_KEYS = {
+    <arg type='u' direction='in' />
-    'BackSpace': '\u232b',
+</method>
-    'space': ' ',
+<method name='Hide'>
-    'Return': '\u23ce',
+    <arg type='u' direction='in' />
-    'Caribou_Prefs': '\u2328',
+</method>
-    'Caribou_ShiftUp': '\u2b06',
+<method name='SetCursorLocation'>
-    'Caribou_ShiftDown': '\u2b07',
+    <arg type='i' direction='in' />
-    'Caribou_Emoticons': '\u263a',
+    <arg type='i' direction='in' />
-    'Caribou_Symbols': '123',
+    <arg type='i' direction='in' />
-    'Caribou_Symbols_More': '{#*',
+    <arg type='i' direction='in' />
-    'Caribou_Alpha': 'Abc',
+</method>
-    'Tab': 'Tab',
+<method name='SetEntryLocation'>
-    'Escape': 'Esc',
+    <arg type='i' direction='in' />
-    'Control_L': 'Ctrl',
+    <arg type='i' direction='in' />
-    'Alt_L': 'Alt'
+    <arg type='i' direction='in' />
-};
+    <arg type='i' direction='in' />
+</method>
+<property name='Name' access='read' type='s' />
+</interface>;
 
-const CaribouKeyboardIface = {
+const Key = new Lang.Class({
-    name: 'org.gnome.Caribou.Keyboard',
+    Name: 'Key',
-    methods:    [ { name: 'Show',
-                    inSignature: 'u',
-                    outSignature: ''
-                  },
-                  { name: 'Hide',
-                    inSignature: 'u',
-                    outSignature: ''
-                  },
-                  { name: 'SetCursorLocation',
-                    inSignature: 'iiii',
-                    outSignature: ''
-                  },
-                  { name: 'SetEntryLocation',
-                    inSignature: 'iiii',
-                    outSignature: ''
-                  } ],
-    properties: [ { name: 'Name',
-                    signature: 's',
-                    access: 'read' } ]
-};
 
-function Key() {
-    this._init.apply(this, arguments);
-}
-
-Key.prototype = {
     _init : function(key) {
         this._key = key;
 
@@ -96,22 +74,12 @@ Key.prototype = {
             this._getExtendedKeys();
             this.actor._extended_keys = this._extended_keyboard;
             this._boxPointer.actor.hide();
-            Main.layoutManager.addChrome(this._boxPointer.actor, { visibleInFullscreen: true });
+            Main.layoutManager.addChrome(this._boxPointer.actor);
         }
     },
 
     _makeKey: function () {
-        let label = this._key.name;
+        let label = GLib.markup_escape_text(this._key.label, -1);
-
-        if (label.length > 1) {
-            let pretty = PRETTY_KEYS[label];
-            if (pretty)
-                label = pretty;
-            else
-                label = this._getUnichar(this._key);
-        }
-
-        label = GLib.markup_escape_text(label, -1);
         let button = new St.Button ({ label: label,
                                       style_class: 'keyboard-key' });
 
@@ -178,7 +146,7 @@ Key.prototype = {
             this.actor.fake_release();
             this._boxPointer.actor.raise_top();
             this._boxPointer.setPosition(this.actor, 0.5);
-            this._boxPointer.show(true);
+            this._boxPointer.show(BoxPointer.PopupAnimation.FULL);
             this.actor.set_hover(false);
             if (!this._grabbed) {
                  Main.pushModal(this.actor);
@@ -189,22 +157,24 @@ Key.prototype = {
         } else {
             if (this._grabbed)
                 this._ungrab();
-            this._boxPointer.hide(true);
+            this._boxPointer.hide(BoxPointer.PopupAnimation.FULL);
         }
     }
-};
+});
 
-function Keyboard() {
+const Keyboard = new Lang.Class({
-    this._init.apply(this, arguments);
+    // HACK: we can't set Name, because it collides with Name dbus property
-}
+    // Name: 'Keyboard',
 
-Keyboard.prototype = {
     _init: function () {
-        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
+        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
+        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 });
@@ -272,11 +242,16 @@ Keyboard.prototype = {
 
         this._addKeys();
 
+        // Keys should be layout according to the group, not the
+        // locale; as Caribou already provides the expected layout,
+        // this means enforcing LTR for all locales.
+        this.actor.text_direction = Clutter.TextDirection.LTR;
+
         this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged));
         this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
 
         if (show)
-            this.show();
+            this.show(Main.layoutManager.focusIndex);
         else
             this._createSource();
     },
@@ -286,7 +261,15 @@ Keyboard.prototype = {
 
         // 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();
@@ -337,6 +320,13 @@ Keyboard.prototype = {
             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;
     },
@@ -385,7 +375,7 @@ Keyboard.prototype = {
         if (!this._enableKeyboard)
             return;
 
-        let monitor = Main.layoutManager.bottomMonitor;
+        let monitor = Main.layoutManager.keyboardMonitor;
         let maxHeight = monitor.height / 3;
         this.actor.width = monitor.width;
 
@@ -466,9 +456,15 @@ Keyboard.prototype = {
         }
     },
 
-    show: function () {
+    shouldTakeEvent: function(event) {
-        this._redraw();
+        let actor = event.get_source();
+        return Main.layoutManager.keyboardBox.contains(actor) ||
+               actor._extended_keys || actor.extended_key;
+    },
 
+    show: function (monitor) {
+        Main.layoutManager.keyboardIndex = monitor;
+        this._redraw();
         Main.layoutManager.showKeyboard();
         this._destroySource();
     },
@@ -492,26 +488,42 @@ Keyboard.prototype = {
             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.show();
+            this._timestamp = timestamp;
+        this.show(Main.layoutManager.focusIndex);
     },
 
     Hide: 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.hide();
     },
 
@@ -532,30 +544,19 @@ Keyboard.prototype = {
     get Name() {
         return 'gnome-shell';
     }
-};
+});
-DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
 
-function KeyboardSource() {
+const KeyboardSource = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'KeyboardSource',
-}
+    Extends: MessageTray.Source,
-
-KeyboardSource.prototype = {
-    __proto__: MessageTray.Source.prototype,
 
     _init: function(keyboard) {
         this._keyboard = keyboard;
-        MessageTray.Source.prototype._init.call(this, _("Keyboard"));
+        this.parent(_("Keyboard"), 'input-keyboard-symbolic');
-
+        this.keepTrayOnSummaryClick = true;
-        this._setSummaryIcon(this.createNotificationIcon());
     },
 
-    createNotificationIcon: function() {
+    handleSummaryClick: function() {
-        return new St.Icon({ icon_name: 'input-keyboard',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
-    },
-
-     handleSummaryClick: function() {
         let event = Clutter.get_current_event();
         if (event.type() != Clutter.EventType.BUTTON_RELEASE)
             return false;
@@ -565,6 +566,7 @@ KeyboardSource.prototype = {
     },
 
     open: function() {
-        this._keyboard.show();
+        // Show the OSK below the message tray
+        this._keyboard.show(Main.layoutManager.bottomIndex);
     }
-};
+});

js/ui/layout.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -8,52 +9,140 @@ const Shell = imports.gi.Shell;
 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 ScreenSaver = imports.misc.screenSaver;
 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;
 
-function LayoutManager() {
+const MonitorConstraint = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'MonitorConstraint',
-}
+    Extends: Clutter.Constraint,
+    Properties: {'primary': GObject.ParamSpec.boolean('primary', 
+                                                      'Primary', 'Track primary monitor',
+                                                      GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
+                                                      false),
+                 'index': GObject.ParamSpec.int('index',
+                                                'Monitor index', 'Track specific monitor',
+                                                GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
+                                                -1, 64, -1)},
+
+    _init: function(props) {
+        this._primary = false;
+        this._index = -1;
+
+        this.parent(props);
+    },
+
+    get primary() {
+        return this._primary;
+    },
+
+    set primary(v) {
+        if (v)
+            this._index = -1;
+        this._primary = v;
+        if (this.actor)
+            this.actor.queue_relayout();
+        this.notify('primary');
+    },
+
+    get index() {
+        return this._index;
+    },
+
+    set index(v) {
+        this._primary = false;
+        this._index = v;
+        if (this.actor)
+            this.actor.queue_relayout();
+        this.notify('index');
+    },
+
+    vfunc_set_actor: function(actor) {
+        if (actor) {
+            if (!this._monitorsChangedId) {
+                this._monitorsChangedId = Main.layoutManager.connect('monitors-changed', Lang.bind(this, function() {
+                    this.actor.queue_relayout();
+                }));
+            }
+        } else {
+            if (this._monitorsChangedId)
+                Main.layoutManager.disconnect(this._monitorsChangedId);
+            this._monitorsChangedId = 0;
+        }
+
+        this.parent(actor);
+    },
+
+    vfunc_update_allocation: function(actor, actorBox) {
+        if (!this._primary && this._index < 0)
+            return;
+
+        let monitor;
+        if (this._primary) {
+            monitor = Main.layoutManager.primaryMonitor;
+        } else {
+            let index = Math.min(this._index, Main.layoutManager.monitors.length - 1);
+            monitor = Main.layoutManager.monitors[index];
+        }
+
+        actorBox.init_rect(monitor.x, monitor.y, monitor.width, monitor.height);
+    }
+});
+
+const LayoutManager = new Lang.Class({
+    Name: 'LayoutManager',
 
-LayoutManager.prototype = {
     _init: function () {
-        this._rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
+        this._rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
         this.monitors = [];
         this.primaryMonitor = null;
         this.primaryIndex = -1;
+        this._keyboardIndex = -1;
         this._hotCorners = [];
+        this._background = null;
         this._leftPanelBarrier = 0;
         this._rightPanelBarrier = 0;
         this._trayBarrier = 0;
 
         this._chrome = new Chrome(this);
 
+        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
+                                                 visible: false,
+                                                 clip_to_allocation: true,
+                                                 layout_manager: new Clutter.BinLayout(),
+                                               });
+        this.addChrome(this.screenShieldGroup);
+
         this.panelBox = new St.BoxLayout({ name: 'panelBox',
                                            vertical: true });
-        this.addChrome(this.panelBox, { affectsStruts: true });
+        this.addChrome(this.panelBox, { affectsStruts: true,
+                                        trackFullscreen: true });
         this.panelBox.connect('allocation-changed',
-                              Lang.bind(this, this._updatePanelBarriers));
+                              Lang.bind(this, this._panelBoxChanged));
 
-        this.trayBox = new St.BoxLayout({ name: 'trayBox' }); 
+        this.trayBox = new St.Widget({ name: 'trayBox',
-        this.addChrome(this.trayBox, { visibleInFullscreen: true });
+                                       layout_manager: new Clutter.BinLayout() }); 
-        this.trayBox.connect('allocation-changed',
+        this.addChrome(this.trayBox);
-                             Lang.bind(this, this._updateTrayBarrier));
 
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
                                               track_hover: true });
-        this.addChrome(this.keyboardBox, { visibleInFullscreen: true });
+        this.addChrome(this.keyboardBox);
         this._keyboardHeightNotifyId = 0;
 
         global.screen.connect('monitors-changed',
                               Lang.bind(this, this._monitorsChanged));
         this._monitorsChanged();
+
+        this._chrome.connect('primary-fullscreen-changed', Lang.bind(this, function(chrome, state) {
+            this.emit('primary-fullscreen-changed', state);
+        }));
     },
 
     // This is called by Main after everything else is constructed;
@@ -146,12 +235,14 @@ LayoutManager.prototype = {
     },
 
     _updateBoxes: function() {
+        this.screenShieldGroup.set_position(0, 0);
+        this.screenShieldGroup.set_size(global.screen_width, global.screen_height);
+
         this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
-        this.keyboardBox.set_position(this.bottomMonitor.x,
+        if (this.keyboardIndex < 0)
-                                      this.bottomMonitor.y + this.bottomMonitor.height);
+            this.keyboardIndex = this.primaryIndex;
-        this.keyboardBox.set_size(this.bottomMonitor.width, -1);
 
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);
@@ -165,6 +256,11 @@ LayoutManager.prototype = {
                               this.bottomMonitor.width, this.bottomMonitor.height);
     },
 
+    _panelBoxChanged: function() {
+        this.emit('panel-box-changed');
+        this._updatePanelBarriers();
+    },
+
     _updatePanelBarriers: function() {
         if (this._leftPanelBarrier)
             global.destroy_pointer_barrier(this._leftPanelBarrier);
@@ -187,22 +283,6 @@ LayoutManager.prototype = {
         }
     },
 
-    _updateTrayBarrier: function() {
-        let monitor = this.bottomMonitor;
-
-        if (this._trayBarrier)
-            global.destroy_pointer_barrier(this._trayBarrier);
-
-        if (Main.messageTray) {
-            this._trayBarrier =
-                global.create_pointer_barrier(monitor.x + monitor.width, monitor.y + monitor.height - Main.messageTray.actor.height,
-                                              monitor.x + monitor.width, monitor.y + monitor.height,
-                                              4 /* BarrierNegativeX */);
-        } else {
-            this._trayBarrier = 0;
-        }
-    },
-
     _monitorsChanged: function() {
         this._updateMonitors();
         this._updateBoxes();
@@ -225,35 +305,85 @@ LayoutManager.prototype = {
         return false;
     },
 
+    get currentMonitor() {
+        let index = global.screen.get_current_monitor();
+        return this.monitors[index];
+    },
+
+    get keyboardMonitor() {
+        return this.monitors[this.keyboardIndex];
+    },
+
     get focusIndex() {
-        let focusWindow = global.display.focus_window;
+        let i = Main.layoutManager.primaryIndex;
 
-        if (focusWindow) {
+        if (global.stage_input_mode == Shell.StageInputMode.FOCUSED ||
-            let wrect = focusWindow.get_outer_rect();
+            global.stage_input_mode == Shell.StageInputMode.FULLSCREEN) {
-            for (let i = 0; i < this.monitors.length; i++) {
+            let focusActor = global.stage.key_focus;
-                let monitor = this.monitors[i];
+            if (focusActor)
-
+                i = this._chrome.findIndexForActor(focusActor);
-                if (monitor.x <= wrect.x && monitor.y <= wrect.y &&
+        } else {
-                    monitor.x + monitor.width > wrect.x &&
+            let focusWindow = global.display.focus_window;
-                    monitor.y + monitor.height > wrect.y)
+            if (focusWindow)
-                    return i;
+                i = this._chrome.findIndexForWindow(focusWindow);
-            }
         }
 
-        return this.primaryIndex;
+        return i;
     },
 
     get focusMonitor() {
         return this.monitors[this.focusIndex];
     },
 
+    set keyboardIndex(v) {
+        this._keyboardIndex = v;
+        this.keyboardBox.set_position(this.keyboardMonitor.x,
+                                      this.keyboardMonitor.y + this.keyboardMonitor.height);
+        this.keyboardBox.set_size(this.keyboardMonitor.width, -1);
+    },
+
+    get keyboardIndex() {
+        return this._keyboardIndex;
+    },
+
     _startupAnimation: function() {
+        this.panelBox.translation_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._background = Meta.BackgroundActor.new_for_screen(global.screen);
+            if (this._background != null) {
+                Main.uiGroup.add_actor(this._background);
+                Tweener.addTween(this._background,
+                                 { opacity: 0,
+                                   time: PLYMOUTH_TRANSITION_TIME,
+                                   transition: 'linear',
+                                   onComplete: this._fadeBackgroundComplete,
+                                   onCompleteScope: this });
+                plymouthTransitionRunning = true;
+            }
+        }
+
+        if (!plymouthTransitionRunning)
+            this._fadeBackgroundComplete();
+    },
+
+    _fadeBackgroundComplete: function() {
         // Don't animate the strut
         this._chrome.freezeUpdateRegions();
 
-        this.panelBox.anchor_y = this.panelBox.height;
+        if (this._background != null) {
+            this._background.destroy();
+            this._background = null;
+        }
+
         Tweener.addTween(this.panelBox,
-                         { anchor_y: 0,
+                         { translation_y: 0,
                            time: STARTUP_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: this._startupAnimationComplete,
@@ -262,11 +392,11 @@ LayoutManager.prototype = {
     },
 
     _startupAnimationComplete: function() {
+        this.emit('panel-box-changed');
         this._chrome.thawUpdateRegions();
     },
 
     showKeyboard: function () {
-        Main.messageTray.hide();
         this.keyboardBox.raise_top();
         Tweener.addTween(this.keyboardBox,
                          { anchor_y: this.keyboardBox.height,
@@ -275,11 +405,16 @@ LayoutManager.prototype = {
                            onComplete: this._showKeyboardComplete,
                            onCompleteScope: this
                          });
-        Tweener.addTween(this.trayBox,
+
-                         { anchor_y: this.keyboardBox.height,
+        if (this.keyboardIndex == this.bottomIndex) {
-                           time: KEYBOARD_ANIMATION_TIME,
+            Tweener.addTween(this.trayBox,
-                           transition: 'easeOutQuad'
+                             { anchor_y: this.keyboardBox.height,
-                         });
+                               time: KEYBOARD_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+        }
+
+        this.emit('keyboard-visible-changed', true);
     },
 
     _showKeyboardComplete: function() {
@@ -289,12 +424,12 @@ LayoutManager.prototype = {
 
         this._keyboardHeightNotifyId = this.keyboardBox.connect('notify::height', Lang.bind(this, function () {
             this.keyboardBox.anchor_y = this.keyboardBox.height;
-            this.trayBox.anchor_y = this.keyboardBox.height;
+            if (this.keyboardIndex == this.bottomIndex)
+                this.trayBox.anchor_y = this.keyboardBox.height;
         }));
     },
 
     hideKeyboard: function (immediate) {
-        Main.messageTray.hide();
         if (this._keyboardHeightNotifyId) {
             this.keyboardBox.disconnect(this._keyboardHeightNotifyId);
             this._keyboardHeightNotifyId = 0;
@@ -306,11 +441,16 @@ LayoutManager.prototype = {
                            onComplete: this._hideKeyboardComplete,
                            onCompleteScope: this
                          });
-        Tweener.addTween(this.trayBox,
+
-                         { anchor_y: 0,
+        if (this.keyboardIndex == this.bottomIndex) {
-                           time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
+            Tweener.addTween(this.trayBox,
-                           transition: 'easeOutQuad'
+                             { anchor_y: 0,
-                         });
+                               time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+        }
+
+        this.emit('keyboard-visible-changed', false);
     },
 
     _hideKeyboardComplete: function() {
@@ -332,8 +472,10 @@ LayoutManager.prototype = {
     // the window manager struts. Changes to @actor's visibility will
     // NOT affect whether or not the strut is present, however.
     //
-    // If %visibleInFullscreen in @params is %true, the actor will be
+    // If %trackFullscreen in @params is %true, the actor's visibility
-    // visible even when a fullscreen window should be covering it.
+    // will be bound to the presence of fullscreen windows on the same
+    // monitor (it will be hidden whenever a fullscreen window is visible,
+    // and shown otherwise)
     addChrome: function(actor, params) {
         this._chrome.addActor(actor, params);
     },
@@ -347,10 +489,8 @@ LayoutManager.prototype = {
     // struts or input region to cover specific children.
     //
     // @params can have any of the same values as in addChrome(),
-    // though some possibilities don't make sense (eg, trying to have
+    // though some possibilities don't make sense. By default, @actor has
-    // a %visibleInFullscreen child of a non-%visibleInFullscreen
+    // the same params as its chrome ancestor.
-    // parent). By default, @actor has the same params as its chrome
-    // ancestor.
     trackChrome: function(actor, params) {
         this._chrome.trackActor(actor, params);
     },
@@ -372,9 +512,13 @@ LayoutManager.prototype = {
     },
 
     findMonitorForActor: function(actor) {
-        return this._chrome.findMonitorForActor(actor);
+        return this.monitors[this._chrome.findIndexForActor(actor)];
-    }
+    },
-};
+
+    findMonitorForWindow: function(window) {
+        return this.monitors[this._chrome.findIndexForWindow(window)];
+    },
+});
 Signals.addSignalMethods(LayoutManager.prototype);
 
 
@@ -382,11 +526,9 @@ Signals.addSignalMethods(LayoutManager.prototype);
 //
 // This class manages a "hot corner" that can toggle switching to
 // overview.
-function HotCorner() {
+const HotCorner = new Lang.Class({
-    this._init();
+    Name: 'HotCorner',
-}
 
-HotCorner.prototype = {
     _init : function() {
         // We use this flag to mark the case where the user has entered the
         // hot corner and has not left both the hot corner and a surrounding
@@ -408,7 +550,7 @@ HotCorner.prototype = {
 
         this.actor.add_actor(this._corner);
 
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
             this._corner.set_position(this.actor.width - this._corner.width, 0);
             this.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
         } else {
@@ -437,9 +579,9 @@ HotCorner.prototype = {
                              Lang.bind(this, this._onCornerLeft));
 
         // Cache the three ripples instead of dynamically creating and destroying them.
-        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
+        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
-        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
+        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
-        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0 });
+        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
 
         Main.uiGroup.add_actor(this._ripple1);
         Main.uiGroup.add_actor(this._ripple2);
@@ -460,7 +602,7 @@ HotCorner.prototype = {
 
         ripple._opacity = startOpacity;
 
-        if (ripple.get_direction() == St.TextDirection.RTL)
+        if (ripple.get_text_direction() == Clutter.TextDirection.RTL)
             ripple.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
 
         ripple.visible = true;
@@ -494,13 +636,15 @@ HotCorner.prototype = {
 
     handleDragOver: function(source, actor, x, y, time) {
         if (source != Main.xdndHandler)
-            return;
+            return DND.DragMotionResult.CONTINUE;
 
         if (!Main.overview.visible && !Main.overview.animationInProgress) {
             this.rippleAnimation();
             Main.overview.showTemporarily();
             Main.overview.beginItemDrag(actor);
         }
+
+        return DND.DragMotionResult.CONTINUE;
     },
 
     _onCornerEntered : function() {
@@ -548,7 +692,7 @@ HotCorner.prototype = {
             return true;
         return false;
     }
-};
+});
 
 
 // This manages the shell "chrome"; the UI that's visible in the
@@ -556,16 +700,14 @@ HotCorner.prototype = {
 // workspace content.
 
 const defaultParams = {
-    visibleInFullscreen: false,
+    trackFullscreen: false,
     affectsStruts: false,
     affectsInputRegion: true
 };
 
-function Chrome() {
+const Chrome = new Lang.Class({
-    this._init.apply(this, arguments);
+    Name: 'Chrome',
-}
 
-Chrome.prototype = {
     _init: function(layoutManager) {
         this._layoutManager = layoutManager;
 
@@ -585,24 +727,13 @@ Chrome.prototype = {
         global.screen.connect('notify::n-workspaces',
                               Lang.bind(this, this._queueUpdateRegions));
 
-        this._screenSaverActive = false;
-        this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
-        this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) {
-            this._onScreenSaverActiveChanged(isActive);
-        }));
-        this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) {
-            if (!err)
-                this._onScreenSaverActiveChanged(result[0]);
-        }));
-
         this._relayout();
     },
 
     init: function() {
-        Main.overview.connect('showing',
+        Main.overview.connect('showing', Lang.bind(this, this._overviewShowing));
-                             Lang.bind(this, this._overviewShowing));
+        Main.overview.connect('hidden', Lang.bind(this, this._overviewHidden));
-        Main.overview.connect('hidden',
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-                             Lang.bind(this, this._overviewHidden));
     },
 
     addActor: function(actor, params) {
@@ -688,28 +819,30 @@ Chrome.prototype = {
 
     _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() {
         for (let i = 0; i < this._trackedActors.length; i++) {
             let actorData = this._trackedActors[i], visible;
+            if (!actorData.trackFullscreen)
+                continue;
             if (!actorData.isToplevel)
                 continue;
 
-            if (this._screenSaverActive)
+            if (this._inOverview || !Main.sessionMode.hasWindows)
-                visible = false;
-            else if (this._inOverview)
                 visible = true;
-            else if (!actorData.visibleInFullscreen &&
+            else if (this.findMonitorForActor(actorData.actor).inFullscreen)
-                     this.findMonitorForActor(actorData.actor).inFullscreen)
                 visible = false;
             else
                 visible = true;
-            Main.uiGroup.set_skip_paint(actorData.actor, !visible);
+            actorData.actor.visible = visible;
         }
     },
 
@@ -725,17 +858,17 @@ Chrome.prototype = {
         this._queueUpdateRegions();
     },
 
-    _relayout: function() {
+    _sessionUpdated: function() {
-        this._monitors = this._layoutManager.monitors;
-        this._primaryMonitor = this._layoutManager.primaryMonitor;
-
-        this._updateFullscreen();
         this._updateVisibility();
         this._queueUpdateRegions();
     },
 
-    _onScreenSaverActiveChanged: function(screenSaverActive) {
+    _relayout: function() {
-        this._screenSaverActive = screenSaverActive;
+        this._monitors = this._layoutManager.monitors;
+        this._primaryIndex = this._layoutManager.primaryIndex;
+        this._primaryMonitor = this._layoutManager.primaryMonitor;
+
+        this._updateFullscreen();
         this._updateVisibility();
         this._queueUpdateRegions();
     },
@@ -748,32 +881,49 @@ Chrome.prototype = {
             let monitor = this._monitors[i];
             if (cx >= monitor.x && cx < monitor.x + monitor.width &&
                 cy >= monitor.y && cy < monitor.y + monitor.height)
-                return monitor;
+                return i;
         }
         // If the center is not on a monitor, return the first overlapping monitor
         for (let i = 0; i < this._monitors.length; i++) {
             let monitor = this._monitors[i];
             if (x + w > monitor.x && x < monitor.x + monitor.width &&
                 y + h > monitor.y && y < monitor.y + monitor.height)
-                return monitor;
+                return i;
         }
         // otherwise on no monitor
-        return null;
+        return -1;
     },
 
-    _findMonitorForWindow: function(window) {
+    findIndexForWindow: function(window) {
-        return this._findMonitorForRect(window.x, window.y, window.width, window.height);
+        let rect = window.get_input_rect();
+        let i = this._findMonitorForRect(rect.x, rect.y, rect.width, rect.height);
+        if (i >= 0)
+            return i;
+        return this._primaryIndex; // Not on any monitor, pretend its on the primary
     },
 
     // This call guarantees that we return some monitor to simplify usage of it
     // In practice all tracked actors should be visible on some monitor anyway
-    findMonitorForActor: function(actor) {
+    findIndexForActor: function(actor) {
         let [x, y] = actor.get_transformed_position();
         let [w, h] = actor.get_transformed_size();
-        let monitor = this._findMonitorForRect(x, y, w, h);
+        let i = this._findMonitorForRect(x, y, w, h);
-        if (monitor)
+        if (i >= 0)
-            return monitor;
+            return i;
-        return this._primaryMonitor; // Not on any monitor, pretend its on the primary
+        return this._primaryIndex; // Not on any monitor, pretend its on the primary
+    },
+
+    findMonitorForWindow: function(window) {
+        let rect = window.get_input_rect();
+        let i = this._findMonitorForRect(rect.x, rect.y, rect.width, rect.height);
+        if (i >= 0)
+            return this._monitors[i];
+        else
+            return null;
+    },
+
+    findMonitorForActor: function(actor) {
+        return this._monitors[this.findIndexForActor(actor)];
     },
 
     _queueUpdateRegions: function() {
@@ -814,14 +964,15 @@ Chrome.prototype = {
 
         for (let i = windows.length - 1; i > -1; i--) {
             let window = windows[i];
-            let layer = window.get_meta_window().get_layer();
+            let metaWindow = window.meta_window;
+            let layer = metaWindow.get_layer();
 
             // Skip minimized windows
             if (!window.showing_on_its_workspace())
                 continue;
 
             if (layer == Meta.StackLayer.FULLSCREEN) {
-                let monitor = this._findMonitorForWindow(window);
+                let monitor = this.findMonitorForWindow(metaWindow);
                 if (monitor)
                     monitor.inFullscreen = true;
             }
@@ -838,7 +989,7 @@ Chrome.prototype = {
                 }
 
                 // Or whether it is monitor sized
-                let monitor = this._findMonitorForWindow(window);
+                let monitor = this.findMonitorForWindow(metaWindow);
                 if (monitor &&
                     window.x <= monitor.x &&
                     window.x + window.width >= monitor.x + monitor.width &&
@@ -855,6 +1006,8 @@ Chrome.prototype = {
         for (let i = 0; i < this._monitors.length; i++)
             wasInFullscreen[i] = this._monitors[i].inFullscreen;
 
+        let primaryWasInFullscreen = this._primaryMonitor.inFullscreen;
+
         this._updateFullscreen();
 
         let changed = false;
@@ -864,10 +1017,15 @@ Chrome.prototype = {
                 break;
             }
         }
+
         if (changed) {
             this._updateVisibility();
             this._queueUpdateRegions();
         }
+
+        if (primaryWasInFullscreen != this._primaryMonitor.inFullscreen) {
+            this.emit('primary-fullscreen-changed', this._primaryMonitor.inFullscreen);
+        }
     },
 
     updateRegions: function() {
@@ -981,4 +1139,6 @@ Chrome.prototype = {
 
         return false;
     }
-};
+});
+
+Signals.addSignalMethods(Chrome.prototype);

js/ui/lightbox.js

@@ -1,5 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
@@ -7,6 +8,8 @@ const St = imports.gi.St;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
+const DEFAULT_FADE_FACTOR = 0.4;
+
 /**
  * Lightbox:
  * @container: parent Clutter.Container
@@ -14,7 +17,8 @@ const Tweener = imports.ui.tweener;
  *           - inhibitEvents: whether to inhibit events for @container
  *           - width: shade actor width
  *           - height: shade actor height
- *           - fadeTime: seconds used to fade in/out
+ *           - fadeInTime: seconds used to fade in
+ *           - fadeOutTime: seconds used to fade out
  *
  * Lightbox creates a dark translucent "shade" actor to hide the
  * contents of @container, and allows you to specify particular actors
@@ -30,21 +34,23 @@ const Tweener = imports.ui.tweener;
  * @container and will track any changes in its size. You can override
  * this by passing an explicit width and height in @params.
  */
-function Lightbox(container, params) {
+const Lightbox = new Lang.Class({
-    this._init(container, params);
+    Name: 'Lightbox',
-}
 
-Lightbox.prototype = {
     _init : function(container, params) {
         params = Params.parse(params, { inhibitEvents: false,
                                         width: null,
                                         height: null,
-                                        fadeTime: null
+                                        fadeInTime: null,
+                                        fadeOutTime: null,
+                                        fadeFactor: DEFAULT_FADE_FACTOR
                                       });
 
         this._container = container;
         this._children = container.get_children();
-        this._fadeTime = params.fadeTime;
+        this._fadeInTime = params.fadeInTime;
+        this._fadeOutTime = params.fadeOutTime;
+        this._fadeFactor = params.fadeFactor;
         this.actor = new St.Bin({ x: 0,
                                   y: 0,
                                   style_class: 'lightbox',
@@ -53,17 +59,17 @@ Lightbox.prototype = {
         container.add_actor(this.actor);
         this.actor.raise_top();
         this.actor.hide();
+        this.shown = false;
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
         if (params.width && params.height) {
             this.actor.width = params.width;
             this.actor.height = params.height;
-            this._allocationChangedSignalId = 0;
         } else {
-            this.actor.width = container.width;
+            let constraint = new Clutter.BindConstraint({ source: container,
-            this.actor.height = container.height;
+                                                          coordinate: Clutter.BindCoordinate.ALL });
-            this._allocationChangedSignalId = container.connect('allocation-changed', Lang.bind(this, this._allocationChanged));
+            this.actor.add_constraint(constraint);
         }
 
         this._actorAddedSignalId = container.connect('actor-added', Lang.bind(this, this._actorAdded));
@@ -72,16 +78,6 @@ Lightbox.prototype = {
         this._highlighted = null;
     },
 
-    _allocationChanged : function(container, box, flags) {
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            this.actor.width = this.width;
-            this.actor.height = this.height;
-            return false;
-        }));
-        this.width = this._container.width;
-        this.height = this._container.height;
-    },
-
     _actorAdded : function(container, newChild) {
         let children = this._container.get_children();
         let myIndex = children.indexOf(this.actor);
@@ -105,24 +101,30 @@ Lightbox.prototype = {
     },
 
     show: function() {
-        if (this._fadeTime) {
+        if (this._fadeInTime) {
+            this.shown = false;
             this.actor.opacity = 0;
             Tweener.addTween(this.actor,
-                             { opacity: 255,
+                             { opacity: 255 * this._fadeFactor,
-                               time: this._fadeTime,
+                               time: this._fadeInTime,
-                               transition: 'easeOutQuad'
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this, function() {
+                                   this.shown = true;
+                               })
                              });
         } else {
-            this.actor.opacity = 255;
+            this.actor.opacity = 255 * this._fadeFactor;
+            this.shown = true;
         }
         this.actor.show();
     },
 
     hide: function() {
-        if (this._fadeTime) {
+        this.shown = false;
+        if (this._fadeOutTime) {
             Tweener.addTween(this.actor,
                              { opacity: 0,
-                               time: this._fadeTime,
+                               time: this._fadeOutTime,
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this, function() {
                                    this.actor.hide();
@@ -189,11 +191,9 @@ Lightbox.prototype = {
      * by destroying its container or by explicitly calling this.destroy().
      */
     _onDestroy: function() {
-        if (this._allocationChangedSignalId != 0)
-            this._container.disconnect(this._allocationChangedSignalId);
         this._container.disconnect(this._actorAddedSignalId);
         this._container.disconnect(this._actorRemovedSignalId);
 
         this.highlight(null);
     }
-};
+});