Bump version to 3.5.3

Update NEWS
Require Mutter 3.5.3

.gitignore

@@ -18,9 +18,13 @@ config
 configure
 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
@@ -62,9 +66,11 @@ 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

NEWS

@@ -1,3 +1,382 @@
+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
@@ -24,20 +403,23 @@
 * Network menu bug fixes
   Giovanni; #664124, #665194, #665680, #666429, #666614]
 * Misc bug fixes [Florian, Jasper, Jonny, Marina, Ron; #647587, #659272,
-  #665261, #666020, #666243]
+  #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, Colin Walters, Ron Yorsten, Marina Zhurakhinskaya
+ Marc Plano-Lesay, Owen Taylor, Colin Walters, Ron Yorsten,
+ Marina Zhurakhinskaya
 
 Translations:
- Petr Kovar [cz], Kris Thomsen [dk], Daniel Mustieles [es],
- Ville-Pekka Vainio [fi], Yaron Shahrabani [he], Ž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]
+ 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
 =====
@@ -195,7 +577,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],

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 4
 
 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,
@@ -153,6 +153,8 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
   /* global initialization routine, called once when plugin
      is loaded */
 
+  g_type_init ();
+
   g_debug ("plugin loaded");
 
   memcpy (&funcs, pfuncs, sizeof (funcs));
@@ -161,6 +163,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;
 }
@@ -262,11 +265,14 @@ NPP_Destroy(NPP           instance,
 /* =================== scripting interface =================== */
 
 typedef struct {
-	NPObject     parent;
-	NPP          instance;
-	GDBusProxy  *proxy;
-	NPObject    *listener;
-	gint         signal_id;
+  NPObject     parent;
+  NPP          instance;
+  GDBusProxy  *proxy;
+  GSettings   *settings;
+  NPObject    *listener;
+  NPObject    *restart_listener;
+  gint         signal_id;
+  guint        watch_name_id;
 } PluginObject;
 
 static void
@@ -284,7 +290,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 +306,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 +337,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,6 +365,9 @@ 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);
@@ -341,7 +381,9 @@ static NPIdentifier enable_extension_id;
 static NPIdentifier install_extension_id;
 static NPIdentifier uninstall_extension_id;
 static NPIdentifier onextension_changed_id;
+static NPIdentifier onrestart_id;
 static NPIdentifier get_errors_id;
+static NPIdentifier launch_extension_prefs_id;
 
 static bool
 plugin_object_has_method (NPObject     *npobj,
@@ -352,7 +394,8 @@ plugin_object_has_method (NPObject     *npobj,
           name == enable_extension_id ||
           name == install_extension_id ||
           name == uninstall_extension_id ||
-          name == get_errors_id);
+          name == get_errors_id ||
+          name == launch_extension_prefs_id);
 }
 
 static inline gboolean
@@ -455,12 +498,69 @@ plugin_enable_extension (PluginObject *obj,
                          NPString      uuid,
                          gboolean      enabled)
 {
+  gboolean ret;
   gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+  gsize length;
+  gchar **uuids;
+  const gchar **new_uuids;
+
   if (!uuid_is_valid (uuid_str))
-    return FALSE;
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }
+
+  uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
+  length = g_strv_length (uuids);
+
+  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_str;
+      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_str))
+            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_str);
+
+  return ret;
+}
+
+static gboolean
+plugin_install_extension (PluginObject *obj,
+                          NPString      uuid)
+{
+  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+
+  if (!uuid_is_valid (uuid_str))
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }
 
   g_dbus_proxy_call (obj->proxy,
-                     (enabled ? "EnableExtension" : "DisableExtension"),
+                     "InstallRemoteExtension",
                      g_variant_new ("(s)", uuid_str),
                      G_DBUS_CALL_FLAGS_NONE,
                      -1, /* timeout */
@@ -473,40 +573,6 @@ plugin_enable_extension (PluginObject *obj,
   return TRUE;
 }
 
-static gboolean
-plugin_install_extension (PluginObject *obj,
-                          NPString      uuid,
-                          NPString      version_tag)
-{
-  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
-  gchar *version_tag_str;
-
-  if (!uuid_is_valid (uuid_str))
-    {
-      g_free (uuid_str);
-      return FALSE;
-    }
-
-  version_tag_str = g_strndup (version_tag.UTF8Characters,
-                               version_tag.UTF8Length);
-
-  g_dbus_proxy_call (obj->proxy,
-                     "InstallRemoteExtension",
-                     g_variant_new ("(ss)",
-                                    uuid_str,
-                                    version_tag_str),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1, /* timeout */
-                     NULL, /* cancellable */
-                     NULL, /* callback */
-                     NULL /* user_data */);
-
-  g_free (uuid_str);
-  g_free (version_tag_str);
-
-  return TRUE;
-}
-
 static gboolean
 plugin_uninstall_extension (PluginObject *obj,
                             NPString      uuid,
@@ -616,6 +682,33 @@ plugin_get_errors (PluginObject *obj,
   return jsonify_variant (res, result);
 }
 
+static gboolean
+plugin_launch_extension_prefs (PluginObject *obj,
+                               NPString      uuid,
+                               NPVariant    *result)
+{
+  gchar *uuid_str;
+
+  uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+  if (!uuid_is_valid (uuid_str))
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }
+
+  g_dbus_proxy_call (obj->proxy,
+                     "LaunchExtensionPrefs",
+                     g_variant_new ("(s)", uuid_str),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1, /* timeout */
+                     NULL, /* cancellable */
+                     NULL, /* callback */
+                     NULL /* user_data */);
+
+  g_free (uuid_str);
+  return TRUE;
+}
+
 static int
 plugin_get_api_version (PluginObject  *obj,
                         NPVariant     *result)
@@ -704,11 +797,9 @@ plugin_object_invoke (NPObject        *npobj,
   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]));
+                                       NPVARIANT_TO_STRING(args[0]));
     }
   else if (name == uninstall_extension_id)
     {
@@ -726,6 +817,14 @@ plugin_object_invoke (NPObject        *npobj,
                                 NPVARIANT_TO_STRING(args[0]),
                                 result);
     }
+  else if (name == launch_extension_prefs_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+
+      return plugin_launch_extension_prefs (obj,
+                                            NPVARIANT_TO_STRING(args[0]),
+                                            result);
+    }
 
   return TRUE;
 }
@@ -735,6 +834,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);
 }
@@ -761,6 +861,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;
 }
@@ -772,25 +899,13 @@ plugin_object_set_property (NPObject        *npobj,
 {
   PluginObject *obj;
 
-  if (!plugin_object_has_property (npobj, name))
-    return FALSE;
+  obj = (PluginObject *)npobj;
 
   if (name == onextension_changed_id)
-    {
-      obj = (PluginObject*) npobj;
-      if (obj->listener)
-        funcs.releaseobject (obj->listener);
+    return plugin_object_set_callback (&obj->listener, value);
 
-      obj->listener = NULL;
-      if (NPVARIANT_IS_OBJECT (*value))
-        {
-          obj->listener = NPVARIANT_TO_OBJECT (*value);
-          funcs.retainobject (obj->listener);
-          return TRUE;
-        }
-      else if (NPVARIANT_IS_NULL (*value))
-        return TRUE;
-    }
+  if (name == onrestart_id)
+    return plugin_object_set_callback (&obj->restart_listener, value);
 
   return FALSE;
 }
@@ -824,7 +939,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");
 }
 
@@ -853,3 +970,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.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.5.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -53,37 +53,58 @@ if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
    recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
-   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.9.16
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.3.3
+GJS_MIN_VERSION=1.33.2
+MUTTER_MIN_VERSION=3.5.3
 FOLKS_MIN_VERSION=0.5.2
-GTK_MIN_VERSION=3.0.0
-GIO_MIN_VERSION=2.31.0
-LIBECAL_MIN_VERSION=2.32.0
-LIBEDATASERVER_MIN_VERSION=1.2.0
-LIBEDATASERVERUI_MIN_VERSION=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.15.5
+GTK_MIN_VERSION=3.3.9
+GIO_MIN_VERSION=2.31.6
+LIBECAL_MIN_VERSION=3.5.3
+LIBEDATASERVER_MIN_VERSION=3.5.3
+LIBEDATASERVERUI_MIN_VERSION=3.5.3
+TELEPATHY_GLIB_MIN_VERSION=0.17.5
 TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
+GCR_MIN_VERSION=3.3.90
+GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
+GNOME_MENUS_REQUIRED_VERSION=3.5.3
+
+AC_ARG_WITH(folks,
+            AS_HELP_STRING([--with-folks],
+                           [Enable folks support]),
+            [with_folks=$withval], [with_folks=yes])
+
+if test x${with_folks} = xyes; then
+  FOLKS_REQUIREMENT="folks >= $FOLKS_MIN_VERSION"
+  AC_DEFINE([HAVE_FOLKS], [1], [folks support])
+  AC_SUBST([HAVE_FOLKS],[1])
+else
+  FOLKS_REQUIREMENT=
+  AC_SUBST([HAVE_FOLKS],[0])
+fi
+AM_CONDITIONAL(BUILD_WITH_FOLKS, test x${with_folks} = xyes)
 
 # 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
+			       $FOLKS_REQUIREMENT
                                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 +113,9 @@ 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
+                               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 
@@ -100,13 +123,7 @@ 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`
-AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
-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 +133,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.2 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse 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.5.1)
 
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -139,6 +157,33 @@ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedatas
 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)
@@ -181,7 +226,7 @@ GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 # 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,7 +266,6 @@ AC_CONFIG_FILES([
   docs/reference/st/Makefile
   docs/reference/st/st-docs.sgml
   js/Makefile
-  js/misc/config.js
   src/Makefile
   browser-plugin/Makefile
   tests/Makefile

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
@@ -12,16 +12,23 @@ desktop_DATA = gnome-shell.desktop
 %.desktop:%.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-searchprovidersdir = $(pkgdatadir)/search_providers
+searchprovidersdir = $(pkgdatadir)/open-search-providers
 dist_searchproviders_DATA =				\
-	search_providers/google.xml				\
-	search_providers/wikipedia.xml
+	open-search-providers/google.xml		\
+	open-search-providers/wikipedia.xml
+
+introspectiondir = $(datadir)/dbus-1/interfaces
+introspection_DATA = org.gnome.ShellSearchProvider.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		\
@@ -31,7 +38,6 @@ dist_theme_DATA =				\
 	theme/filter-selected-rtl.svg		\
 	theme/gdm.css				\
 	theme/gnome-shell.css			\
-	theme/panel-border.svg			\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
 	theme/panel-button-highlight-wide.svg	\
@@ -50,6 +56,11 @@ dist_theme_DATA =				\
 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,6 +70,8 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
 
 all-local: gschemas.compiled
 
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = gnome-shell-overrides.convert
 
 shadersdir = $(pkgdatadir)/shaders
 shaders_DATA = \
@@ -67,13 +80,18 @@ shaders_DATA = \
 
 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
+	gnome-shell-extension-prefs.desktop.in.in	\
+	$(introspection_DATA)				\
 	$(menu_DATA)					\
 	$(shaders_DATA)					\
-	org.gnome.shell.gschema.xml.in
+	$(convert_DATA)					\
+	org.gnome.shell.gschema.xml.in.in
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
+	gnome-shell-extension-prefs.in			\
 	$(desktop_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,147 @@
+<!DOCTYPE node PUBLIC
+'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
+'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+<node>
+  <interface name="org.gnome.Shell.SearchProvider">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          The interface used for integrating into GNOME Shell's search
+          interface.
+        </doc:para>
+      </doc:description>
+    </doc:doc>
+
+    <method name="GetInitialResultSet">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when the user first begins a search.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of search terms, which the provider should treat as
+              logical AND.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifier strings representing items which
+              match the given search terms. Identifiers must be unique within
+              the provider's domain, but other than that may be chosen freely
+              by the provider.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <method name="GetSubsearchResultSet">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when a search is performed which is a "subsearch" of
+            the previous search, e.g. the method may return less results, but
+            not more or different results.
+
+            This allows search providers to only search through the previous
+            result set, rather than possibly performing a full re-query.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of item identifiers
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              Array of updated search terms, which the provider should treat as
+              logical AND.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="as" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifier strings representing items which
+              match the given search terms. Identifiers must be unique within
+              the provider's domain, but other than that may be chosen freely
+              by the provider.
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <method name="GetResultMetas">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Return an array of meta data used to display each given result
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="as" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              An array of result identifiers as returned by
+              GetInitialResultSet() or GetSubsearchResultSet()
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="a{sv}" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              A dictionary describing the given search result, containing
+              'id', 'name' (both strings) and either 'icon' (a serialized
+              GIcon) or 'icon-data' (raw image data as (iiibiiay) - width,
+              height, rowstride, has-alpha, bits per sample, channels, data)
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <method name="ActivateResult">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Called when the users chooses a given result. The result should
+            be displayed in the application associated with the corresponding
+            provider.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="s" direction="in">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              A result identifier as returned by GetInitialResultSet() or
+              GetSubsearchResultSet()
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+  </interface>
+</node>

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

@@ -53,15 +53,17 @@
     </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>
-    <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 +78,24 @@
       </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-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 +107,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 +129,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 quality=8 speed=6 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>
@@ -170,6 +172,14 @@
       </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>

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/gnome-shell.css

@@ -17,10 +17,16 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* Text Styles */
+
+/* default text style */
 stage {
     font-family: cantarell, sans-serif;
+    font-size: 11pt;
+    color: white;
 }
 
+/* links */
 .shell-link {
     color: #0000ff;
     text-decoration: underline;
@@ -30,10 +36,28 @@ stage {
     color: #0000e0;
 }
 
-.label-shadow {
-    color: rgba(0,0,0,0.5);
+/* small */
+.app-well-menu,
+.contact-details-status,
+.run-dialog-label,
+.run-dialog-error-label {
+    font-size: 9pt;
 }
 
+/* small bold */
+.dash-label,
+.window-caption,
+.switcher-list, 
+.source-title,
+.app-well-app > .overview-icon,
+.remove-favorite > .overview-icon,
+.search-result-content > .overview-icon {
+    font-size: 9pt;
+    font-weight: bold;
+}
+
+/* Scroll Bars */
+
 StScrollBar
 {
     padding: 0px;
@@ -44,6 +68,11 @@ StScrollView.vfade
     -st-vfade-offset: 68px;
 }
 
+StScrollView.hfade
+{
+    -st-hfade-offset: 68px;
+}
+
 StScrollView StScrollBar
 {
     min-width: 16px;
@@ -60,7 +89,6 @@ StScrollBar StBin#trough {
 StScrollBar StButton#vhandle
 {
     background-image: url("scroll-vhandle.svg");
-    background-size: contain;
     background-color: #252525;
     border: 1px solid #080808;
     border-radius: 8px;
@@ -69,7 +97,6 @@ StScrollBar StButton#vhandle
 StScrollBar StButton#hhandle
 {
     background-image: url("scroll-hhandle.svg");
-    background-size: contain;
     background-color: #252525;
     border: 1px solid #080808;
     border-radius: 8px;
@@ -81,15 +108,28 @@ StScrollBar StButton#vhandle:hover
     background-color: #292929;
 }
 
-StTooltip StLabel {
-    border: 1px solid rgba(255,255,255,0.6);
-    border-radius: 5px;
-    padding: 2px 12px;
-    background-color: rgba(0,0,0,0.9);
-    color: #ffffff;
-    font-size: 0.8em;
-    font-weight: normal;
-    text-align: center;
+/* Check Boxes */
+
+.check-box ShellGenericContainer {
+    spacing: .8em;
+}
+
+.check-box StBin {
+    width: 24px;
+    height: 22px;
+    background-image: url("checkbox-off.svg");
+}
+
+.check-box:focus StBin {
+    background-image: url("checkbox-off-focused.svg");
+}
+
+.check-box:checked StBin {
+    background-image: url("checkbox.svg");
+}
+
+.check-box:focus:checked StBin {
+    background-image: url("checkbox-focused.svg");
 }
 
 /* PopupMenu */
@@ -104,8 +144,6 @@ StTooltip StLabel {
 }
 
 .popup-menu {
-    color: #ffffff;
-    font-size: 10.5pt;
     min-width: 200px;
 }
 
@@ -144,8 +182,6 @@ StTooltip StLabel {
 .popup-combo-menu {
     background-color: rgba(0,0,0,0.9);
     padding: 1em 0em;
-    color: #ffffff;
-    font-size: 10.5pt;
     border: 1px solid #5f5f5f;
     border-radius: 9px;
 }
@@ -215,10 +251,10 @@ StTooltip StLabel {
 }
 
 .popup-menu-icon {
-    icon-size: 1.14em;
+    icon-size: 1.09em;
 }
 
-/* Switches (to be used in menus) */
+/* Switches */
 .toggle-switch {
     width: 65px;
     height: 22px;
@@ -246,46 +282,61 @@ StTooltip StLabel {
     spacing: .5em;
 }
 
-/* Shared button properties */
+/* Buttons */
 
-.dash-search-button, .notification-button, .notification-icon-button,
-.hotplug-notification-item, .hotplug-resident-eject-button,
+.dash-search-button,
+.notification-button,
+.notification-icon-button,
+.hotplug-notification-item,
+.hotplug-resident-eject-button,
 .modal-dialog-button {
-    color: white;
+    font-weight: bold;
     border: 1px solid #8b8b8b;
     background-gradient-direction: vertical;
     background-gradient-start: rgba(255, 255, 255, 0.2);
     background-gradient-end: rgba(255, 255, 255, 0);
 }
 
-.dash-search-button:hover, .notification-button:hover,
-.notification-icon-button:hover, .hotplug-notification-item:hover,
-.hotplug-resident-eject-button:hover, .modal-dialog-button:hover {
+.dash-search-button:hover,
+.notification-button:hover,
+.notification-icon-button:hover,
+.hotplug-notification-item:hover,
+.hotplug-resident-eject-button:hover,
+.modal-dialog-button:hover {
     background-gradient-start: rgba(255, 255, 255, 0.3);
     background-gradient-end: rgba(255, 255, 255, 0.1);
 }
 
-.dash-search-button:selected, .notification-button:focus,
-.notification-icon-button:focus, .hotplug-notification-item:focus,
+.dash-search-button:selected,
+.dash-search-button:focus,
+.notification-button:focus,
+.notification-icon-button:focus,
+.hotplug-notification-item:focus,
 .modal-dialog-button:focus {
     border: 2px solid #8b8b8b;
 }
 
-.dash-search-button:active, .dash-search-button:pressed,
-.notification-button:active, .notification-icon-button:active,
-.hotplug-notification-item:active, .hotplug-resident-eject-button:active,
-.modal-dialog-button:active, .modal-dialog-button:pressed {
+.dash-search-button:active,
+.dash-search-button:pressed,
+.notification-button:active,
+.notification-icon-button:active,
+.hotplug-notification-item:active,
+.hotplug-resident-eject-button:active,
+.modal-dialog-button:active,
+.modal-dialog-button:pressed {
     background-gradient-start: rgba(255, 255, 255, 0);
     background-gradient-end: rgba(255, 255, 255, 0.2);
 }
 
+.notification-icon-button:insensitive,
+.notification-button:insensitive {
+    color: #9f9f9f;
+}
+
 /* Panel */
 
 #panel {
-    color: #ffffff;
     background-color: black;
-    border-image: url("panel-border.svg") 1;
-    font-size: 10.5pt;
     font-weight: bold;
     height: 1.86em;
 }
@@ -311,24 +362,27 @@ StTooltip StLabel {
 }
 
 .panel-corner {
-    -panel-corner-radius: 10px;
+    -panel-corner-radius: 6px;
     -panel-corner-background-color: black;
-    -panel-corner-inner-border-width: 2px;
-    -panel-corner-inner-border-color: transparent;
-    -panel-corner-outer-border-width: 1px;
-    -panel-corner-outer-border-color: #536272;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent;
 }
 
 .panel-corner:active,
 .panel-corner:overview,
 .panel-corner:focus {
-    -panel-corner-inner-border-color: rgba(255,255,255,0.8);
+    -panel-corner-border-color: rgba(255,255,255,0.8);
 }
 
 #appMenu {
     spacing: 4px;
 }
 
+/* used for the app menu header only */
+.label-shadow {
+    color: rgba(0,0,0,0.5);
+}
+
 .panel-button #appMenuIcon {
     app-icon-bottom-clip: 1px;
 }
@@ -360,9 +414,8 @@ StTooltip StLabel {
 .panel-button:active,
 .panel-button:overview,
 .panel-button:focus {
-    border-image: url("panel-button-border.svg") 10 10 0 2;
+    border-image: url("panel-button-border.svg") 6 10 0 2;
     background-image: url("panel-button-highlight-wide.svg");
-    background-size: contain;
     color: white;
     text-shadow: black 0px 2px 2px;
 }
@@ -371,7 +424,6 @@ StTooltip StLabel {
 .panel-status-button:checked,
 .panel-status-button:focus {
     background-image: url("panel-button-highlight-narrow.svg");
-    background-size: contain;
 }
 
 .panel-button:active > .system-status-icon,
@@ -384,6 +436,12 @@ StTooltip StLabel {
     -boxpointer-gap: 4px
 }
 
+#networkMenu {
+    spacing: 4px;
+}
+
+/* User Menu */
+
 #panelUserMenu {
     spacing: 4px;
 }
@@ -423,8 +481,6 @@ StTooltip StLabel {
     padding: .4em 0em;
     border-radius: 4px;
     border: 1px solid #5f5f5f;
-    color: #ffffff;
-    font-size: 10.5pt;
 }
 
 .status-chooser-status-item,
@@ -433,7 +489,7 @@ StTooltip StLabel {
 }
 
 .system-status-icon {
-    icon-size: 1.14em;
+    icon-size: 1.09em;
 }
 
 /* Overview */
@@ -443,7 +499,6 @@ StTooltip StLabel {
 }
 
 .window-caption {
-    color: white;
     spacing: 25px;
 }
 
@@ -477,9 +532,7 @@ StTooltip StLabel {
 .window-caption {
     background: rgba(0,0,0,0.5);
     border-radius: 8px;
-    font-size: 9pt;
-    font-weight: bold;
-    padding: 6px 12px;
+    padding: 4px 12px;
     -shell-caption-spacing: 12px;
 }
 
@@ -526,13 +579,14 @@ StTooltip StLabel {
 
 #viewSelector {
     spacing: 1em;
-    font-size: 12pt;
 }
 
 #viewSelectorTabBar {
     padding: 1em;
 }
 
+/* Search Box */
+
 #searchArea {
     padding: 0px 24px;
 }
@@ -540,6 +594,7 @@ StTooltip StLabel {
 #searchEntry {
     padding: 4px 12px;
     border-radius: 17px;
+    font-size: 12pt;
     color: rgb(128, 128, 128);
     border: 2px solid rgba(245,245,245,0.2);
     background-gradient-start: rgba(5,5,6,0.1);
@@ -576,8 +631,11 @@ StTooltip StLabel {
     color: #8d8f8a;
 }
 
+/* View Tabs */
+
 .view-tab-title {
     color: #888a85;
+    font-size: 12pt;
     font-weight: bold;
     padding: 0px 0.75em;
     height: 1.5em;
@@ -593,6 +651,8 @@ StTooltip StLabel {
     border-radius: 0.25em;
 }
 
+/* Search Results */
+
 #searchResults {
     padding: 20px 10px 10px 10px;
     spacing: 18px;
@@ -617,7 +677,6 @@ StTooltip StLabel {
 }
 
 .search-section-results {
-    color: #ffffff;
     padding: 6px;
 }
 
@@ -644,38 +703,27 @@ StTooltip StLabel {
     font-weight: bold;
 }
 
+.dash-search-button:focus,
 .dash-search-button:selected {
     padding-top: 3px;
     padding-bottom: 4px;
     width: 298px;
 }
 
-.dash-search-button-label {
-    color: white;
-    font-size: 11pt;
-}
-
 .dash-label {
     border-radius: 7px;
     padding: 4px 12px;
     background-color: rgba(0,0,0,0.5);
-    color: #ffffff;
-    font-size: 0.9em;
-    font-weight: bold;;
     text-align: center;
     -x-offset: 8px;
 }
 
-/* Apps */
+/* Application Launchers and Grid */
 
 .icon-grid {
     spacing: 36px;
-    -shell-grid-item-size: 118px;
-}
-
-.contact-grid {
-    spacing: 36px;
-    -shell-grid-item-size: 272px; /* 2 * -shell-grid-item-size + spacing */
+    -shell-grid-horizontal-item-size: 118px;
+    -shell-grid-vertical-item-size: 118px;
 }
 
 .icon-grid .overview-icon {
@@ -693,7 +741,6 @@ StTooltip StLabel {
 }
 
 .app-filter {
-    font-size: 10.5pt;
     font-weight: bold;
     height: 2.85em;
     color: #aaa;
@@ -707,13 +754,11 @@ StTooltip StLabel {
 .app-filter:selected {
     color: #ffffff;
     background-image: url("filter-selected-ltr.svg");
-    background-size: contain;
     background-position: 190px 10px;
 }
 
 .app-filter:selected:rtl {
     background-image: url("filter-selected-rtl.svg");
-    background-size: contain;
     background-position: 10px 10px;
 }
 
@@ -740,12 +785,32 @@ StTooltip StLabel {
     border-radius: 4px;
     padding: 3px;
     border: 1px rgba(0,0,0,0);
-    font-size: 7.5pt;
-    color: white;
     transition-duration: 100;
     text-align: center;
 }
 
+.app-well-app.running > .overview-icon {
+    text-shadow: black 0px 2px 2px;
+    background-image: url("running-indicator.svg");
+    background-size: contain;
+}
+
+.app-well-app:hover > .overview-icon,
+.remove-favorite:hover > .overview-icon,
+.search-result-content:hover > .overview-icon {
+    background-color: rgba(255,255,255,0.1);
+    text-shadow: black 0px 2px 2px;
+    transition-duration: 100;
+}
+
+/* Contacts */
+
+.contact-grid {
+    spacing: 36px;
+    -shell-grid-horizontal-item-size: 272px; /* 2 * -shell-grid-horizontal-item-size + spacing */
+    -shell-grid-vertical-item-size: 118px;
+}
+
 .contact {
     width: 272px; /* Same width as two normal results + spacing */
     height: 118px; /* Aspect ratio = 1.75. Normal US business card ratio */
@@ -756,13 +821,12 @@ StTooltip StLabel {
 }
 
 .contact-content {
-    border-radius: 2px;
+    border-radius: 7px;
     padding: 8px;
     width: 232px;
     height: 84px;
-    background-color: white;
-    color: black;
-    text-align: center;
+    background-color: rgba(0.0, 0.0, 0.0, 0.5);
+    color: white;
 }
 
 .contact-icon {
@@ -770,20 +834,16 @@ StTooltip StLabel {
 }
 
 .contact-details {
-    padding: 6px 8px 11px 8px;
+    padding: 0px 6px 22px 10px;
 }
 
 .contact-details-alias {
-    font-size: 16px;
-    padding-bottom: 11px;
-}
-
-.contact-details-status {
-    font-size: 11pt;
+    font-size: 18px;
+    padding-bottom: 8px;
 }
 
 .contact-details-status-icon {
-    padding-right: 2px;
+    padding-right: 4px;
 }
 
 .contact:hover {
@@ -791,36 +851,15 @@ StTooltip StLabel {
     transition-duration: 100;
 }
 
-.app-well-app.running > .overview-icon {
-    text-shadow: black 0px 2px 2px;
-    background-image: url("running-indicator.svg");
-    background-size: contain;
-}
-
+.contact:focus,
+.app-well-app:focus > .overview-icon,
+.search-result-content:focus > .overview-icon,
 .contact:selected,
 .app-well-app:selected > .overview-icon,
 .search-result-content:selected > .overview-icon {
     background-color: rgba(255,255,255,0.33);
 }
 
-.app-well-app:hover > .overview-icon,
-.remove-favorite:hover > .overview-icon,
-.search-result-content:hover > .overview-icon {
-    background-color: rgba(255,255,255,0.1);
-    text-shadow: black 0px 2px 2px;
-    transition-duration: 100;
-}
-
-.contact:focus,
-.app-well-app:focus > .overview-icon,
-.search-result-content:focus > .overview-icon {
-    border: 1px solid #cccccc;
-}
-
-.app-well-menu {
-    font-size: 9pt;
-}
-
 /* LookingGlass */
 
 #LookingGlassDialog
@@ -830,8 +869,6 @@ StTooltip StLabel {
     padding: 4px;
     border: 2px solid grey;
     border-radius: 4px;
-
-    color: #ffffff;
 }
 
 #LookingGlassDialog > #Toolbar
@@ -871,14 +908,8 @@ StTooltip StLabel {
     padding-bottom: 8px;
 }
 
-.lg-dialog StLabel
-{
-    color: #ffffff;
-}
-
 .lg-dialog StEntry
 {
-    color: #ffffff;
     selection-background-color: #bbbbbb;
     selected-color: #333333;
 }
@@ -955,7 +986,6 @@ StTooltip StLabel {
     border: 2px solid grey;
     border-radius: 4px;
     padding: 6px;
-    color: #ffffff;
 }
 
 /* Calendar popup */
@@ -1034,7 +1064,6 @@ StTooltip StLabel {
 
 .datemenu-date-label {
     padding: .4em 1.75em;
-    font-size: 10.5pt;
     color: #cccccc;
     font-weight: bold;
 }
@@ -1181,10 +1210,9 @@ StTooltip StLabel {
     background-gradient-start: rgba(0,0,0,0.01);
     background-gradient-end: rgba(0,0,0,0.82);
     height: 36px;
-    color: white;
 }
 
-#notification {
+.notification {
     font-size: 11pt;
     border-radius: 10px 10px 0px 0px;
     background: rgba(0,0,0,0.8);
@@ -1194,7 +1222,7 @@ StTooltip StLabel {
     width: 34em;
 }
 
-#notification.multi-line-notification {
+.notification.multi-line-notification {
     padding-bottom: 8px;
 }
 
@@ -1216,14 +1244,13 @@ StTooltip StLabel {
     color: white;
 }
 
-.summary-boxpointer #notification {
+.summary-boxpointer .notification {
     border-radius: 9px;
     background: rgba(0,0,0,0) !important;
     padding-bottom: 12px;
 }
 
 .summary-boxpointer #summary-right-click-menu {
-    font-size: 10.5pt;
     padding-top: 12px;
     padding-bottom: 12px;
 }
@@ -1234,10 +1261,6 @@ StTooltip StLabel {
     padding-bottom: 6px;
 }
 
-#summary-notification-stack-scrollview > .top-shadow, #summary-notification-stack-scrollview > .bottom-shadow {
-    height: 1em;
-}
-
 #summary-notification-stack-scrollview:ltr {
     padding-right: 8px;
 }
@@ -1246,34 +1269,29 @@ StTooltip StLabel {
     padding-left: 8px;
 }
 
-#notification-scrollview {
+.notification-scrollview {
     max-height: 10em;
     -st-vfade-offset: 24px;
 }
 
-#notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow {
-    height: 1em;
-}
-
-#notification-scrollview:ltr > StScrollBar {
+.notification-scrollview:ltr > StScrollBar {
     padding-left: 6px;
 }
 
-#notification-scrollview:rtl > StScrollBar {
+.notification-scrollview:rtl > StScrollBar {
     padding-right: 6px;
 }
 
-#notification-body {
+.notification-body {
     spacing: 5px;
 }
 
-#notification-actions {
+.notification-actions {
     spacing: 10px;
 }
 
 .notification-button {
     border-radius: 18px;
-    font-size: 11pt;
     padding: 4px 42px 5px;
 }
 
@@ -1303,7 +1321,6 @@ StTooltip StLabel {
 .hotplug-notification-item {
     padding: 2px 10px;
     border-radius: 18px;
-    font-size: 10.5pt;
 }
 
 .hotplug-notification-item:focus {
@@ -1396,7 +1413,7 @@ StTooltip StLabel {
     font-style: italic;
 }
 
-#notification StEntry {
+.notification StEntry {
     padding: 4px;
     border-radius: 4px;
     color: #a8a8a8;
@@ -1412,7 +1429,7 @@ StTooltip StLabel {
     caret-size: 1px;
 }
 
-#notification StEntry:focus {
+.notification StEntry:focus {
     border: 1px solid #8b8b8b;
     color: #333333;
     background-gradient-direction: vertical;
@@ -1446,7 +1463,6 @@ StTooltip StLabel {
 }
 
 .summary-source-button {
-    color: #fff;
     text-shadow: black 0px 2px 2px;
 }
 
@@ -1499,8 +1515,6 @@ StTooltip StLabel {
 }
 
 .source-title {
-    font-size: 9pt;
-    font-weight: bold;
     padding-left: 4px;
 }
 
@@ -1520,9 +1534,6 @@ StTooltip StLabel {
     border: 1px solid rgba(128,128,128,0.40);
     border-radius: 24px;
     padding: 20px;
-
-    font-size: 9pt;
-    color: white;
 }
 
 .switcher-list-item-container {
@@ -1623,7 +1634,6 @@ StTooltip StLabel {
     border: 0px;
     background: rgba(255,255,255,0.5);
     background-image: url("ws-switch-arrow-up.svg");
-    background-size: contain;
     border-radius: 8px;
 }
 
@@ -1632,7 +1642,6 @@ StTooltip StLabel {
     border: 0px;
     background: rgba(255,255,255,0.5);
     background-image: url("ws-switch-arrow-down.svg");
-    background-size: contain;
     border-radius: 8px;
 }
 
@@ -1644,12 +1653,20 @@ StTooltip StLabel {
 }
 
 /* Modal Dialogs */
+
+/* Dialog Subject Text Style */
+.show-processes-dialog-subject,
+.mount-question-dialog-subject,
+.end-session-dialog-subject {
+    font-size: 14pt;
+    font-weight: bold;
+    color: #999999;
+}
+
 .modal-dialog {
-    font-size: 12pt;
     border-radius: 24px;
     background-color: rgba(0.0, 0.0, 0.0, 0.9);
     border: 2px solid #868686;
-    color: #babdb6;
 
     padding-right: 42px;
     padding-left: 42px;
@@ -1659,12 +1676,11 @@ StTooltip StLabel {
 
 .modal-dialog-button-box {
     spacing: 21px;
+    padding-top: 50px;
 }
 
 .modal-dialog-button {
     border-radius: 18px;
-    font-size: 11pt;
-    color: white;
 
     margin-left: 10px;
     margin-right: 10px;
@@ -1680,15 +1696,6 @@ StTooltip StLabel {
 }
 
 /* Run Dialog */
-.run-dialog-label {
-    font-size: 9pt;
-    color: white;
-}
-
-.run-dialog-error-label {
-    font-size: 9pt;
-    color: white;
-}
 
 .run-dialog-error-box {
     padding-top: 15px;
@@ -1696,10 +1703,8 @@ StTooltip StLabel {
 }
 
 .run-dialog-entry {
-    font-size: 10.5pt;
     font-weight: bold;
     width: 23em;
-    color: white;
     selection-background-color: white;
     selected-color: black;
 }
@@ -1717,18 +1722,18 @@ StTooltip StLabel {
     background-color: rgba(0, 0, 0, 0.4);
 }
 
+.flashspot {
+    background-color: white;
+}
+
 /* End Session Dialog */
 .end-session-dialog {
     spacing: 42px;
 }
 
 .end-session-dialog-subject {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #666666;
-    padding-top: 10px;
     padding-left: 17px;
-    padding-bottom: 30px;
+    padding-bottom: 20px;
 }
 
 .end-session-dialog-subject:rtl {
@@ -1737,8 +1742,6 @@ StTooltip StLabel {
 }
 
 .end-session-dialog-description {
-    font-size: 10pt;
-    color: white;
     padding-left: 17px;
     width: 28em;
 }
@@ -1755,6 +1758,7 @@ StTooltip StLabel {
 }
 
 .end-session-dialog-shutdown-icon {
+    color: #bebebe;
     width: 32px;
     height: 32px;
 }
@@ -1821,14 +1825,15 @@ StTooltip StLabel {
 
 .show-processes-dialog-subject,
 .mount-question-dialog-subject {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #666666;
     padding-top: 10px;
     padding-left: 17px;
     padding-bottom: 6px;
 }
 
+.mount-question-dialog-subject {
+    max-width: 500px;
+}
+
 .show-processes-dialog-subject:rtl,
 .mount-question-dialog-subject:rtl {
     padding-left: 0px;
@@ -1837,8 +1842,6 @@ StTooltip StLabel {
 
 .show-processes-dialog-description,
 .mount-question-dialog-description {
-    font-size: 10pt;
-    color: white;
     padding-left: 17px;
     width: 28em;
 }
@@ -1889,32 +1892,77 @@ StTooltip StLabel {
     font-size: 10pt;
 }
 
-/* PolicyKit Authentication Dialog */
-.polkit-dialog {
+/* Password or Authentication Dialog */
+.prompt-dialog {
     /* this is the width of the entire modal popup */
     width: 500px;
 }
 
-.polkit-dialog-main-layout {
+.prompt-dialog-main-layout {
     spacing: 24px;
     padding: 10px;
 }
 
-.polkit-dialog-message-layout {
+.prompt-dialog-message-layout {
     spacing: 16px;
 }
 
-.polkit-dialog-headline {
+.prompt-dialog-headline {
     font-size: 12pt;
     font-weight: bold;
     color: #666666;
 }
 
-.polkit-dialog-description {
-    font-size: 10pt;
-    color: white;
+.prompt-dialog-password-label:ltr {
+    padding-right: 0.5em;
 }
 
+.prompt-dialog-password-label:rtl {
+    padding-left: 0.5em;
+}
+
+.prompt-dialog-password-entry {
+    background-gradient-start: rgb(236,236,236);
+    background-gradient-end: white;
+    background-gradient-direction: vertical;
+    color: black;
+    selected-color: white;
+    border-radius: 5px;
+    border: 2px solid #555753;
+}
+
+.prompt-dialog-password-entry:focus {
+    border: 2px solid #3465a4;
+}
+
+.prompt-dialog-password-entry .capslock-warning {
+    icon-size: 16px;
+    warning-color: #999;
+    padding: 0 4px;
+}
+
+.prompt-dialog-error-label {
+    font-size: 10pt;
+    color: #ffff00;
+    padding-bottom: 8px;
+}
+
+.prompt-dialog-info-label {
+    font-size: 10pt;
+    padding-bottom: 8px;
+}
+
+.hidden {
+    color: rgba(0,0,0,0);
+}
+
+.prompt-dialog-null-label {
+    font-size: 10pt;
+    padding-bottom: 8px;
+}
+
+/* Polkit Dialog */
+
 .polkit-dialog-user-layout {
     padding-left: 10px;
     spacing: 10px;
@@ -1929,56 +1977,16 @@ StTooltip StLabel {
     color: #ff0000;
 }
 
-.polkit-dialog-password-label:ltr {
-    padding-right: 0.5em;
-}
-
-.polkit-dialog-password-label:rtl {
-    padding-left: 0.5em;
-}
-
-.polkit-dialog-password-entry {
-    background-gradient-start: rgb(236,236,236);
-    background-gradient-end: white;
-    background-gradient-direction: vertical;
-    color: black;
-    selected-color: white;
-    border-radius: 5px;
-    border: 2px solid #555753;
-}
-
-.polkit-dialog-password-entry:focus {
-    border: 2px solid #3465a4;
-}
-
-.polkit-dialog-password-entry .capslock-warning {
-    icon-size: 16px;
-    warning-color: #999;
-    padding: 0 4px;
-}
-
-.polkit-dialog-error-label {
-    font-size: 10pt;
-    color: #ffff00;
-    padding-bottom: 8px;
-}
-
-.polkit-dialog-info-label {
-    font-size: 10pt;
-    padding-bottom: 8px;
-}
-
-/* intentionally left transparent to avoid dialog changing size */
-.polkit-dialog-null-label {
-    font-size: 10pt;
-    color: rgba(0,0,0,0);
-    padding-bottom: 8px;
-}
+/* Network Agent Dialog */
 
 .network-dialog-secret-table {
     spacing-rows: 15px;
 }
 
+.keyring-dialog-control-table {
+    spacing-rows: 15px;
+}
+
 /* Magnifier */
 
 .magnifier-zoom-region {

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/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"

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

@@ -66,4 +66,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,4 +1,19 @@
 
+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_FOLKS@|$(HAVE_FOLKS)|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 = 	\
@@ -7,10 +22,11 @@ nobase_dist_js_DATA = 	\
 	gdm/fingerprint.js	\
 	gdm/loginDialog.js	\
 	gdm/powerMenu.js	\
+	gdm/systemd.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		\
@@ -26,17 +42,20 @@ nobase_dist_js_DATA = 	\
 	ui/autorunManager.js    \
 	ui/boxpointer.js	\
 	ui/calendar.js		\
+	ui/checkBox.js		\
 	ui/contactDisplay.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/flashspot.js		\
 	ui/iconGrid.js		\
 	ui/keyboard.js		\
+	ui/keyringPrompt.js	\
 	ui/layout.js		\
 	ui/lightbox.js		\
 	ui/link.js		\
@@ -47,6 +66,7 @@ nobase_dist_js_DATA = 	\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
 	ui/networkAgent.js	\
+	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
@@ -56,6 +76,7 @@ nobase_dist_js_DATA = 	\
 	ui/placeDisplay.js	\
 	ui/polkitAuthenticationAgent.js \
 	ui/popupMenu.js		\
+	ui/remoteSearch.js	\
 	ui/runDialog.js		\
 	ui/scripting.js		\
 	ui/search.js		\

js/extensionPrefs/main.js

@@ -0,0 +1,271 @@
+
+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">
+<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), null);
+        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[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/fingerprint.js

@@ -11,10 +11,17 @@ const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
 </method>
 </interface>;
 
-const FprintManagerProxy = Gio.DBusProxy.makeProxyWrapper(FprintManagerIface);
+const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 
 function FprintManager() {
-    return new FprintManagerProxy(Gio.DBus.system,
-                           'net.reactivated.Fprint',
-                           '/net/reactivated/Fprint/Manager');
-};
+    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_AUTO_START |
+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+
+    self.init(null);
+    return self;
+}

js/gdm/loginDialog.js

@@ -205,7 +205,8 @@ const UserListItem = new Lang.Class({
             // We use background-image instead of, say, St.TextureCache
             // so the theme writers can add a rounded frame around the image
             // and so theme writers can pick the icon size.
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
+            this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                    'background-size: contain;');
         } else {
             this._iconBin.hide();
         }
@@ -487,6 +488,9 @@ const UserList = new Lang.Class({
         if (user.is_system_account())
             return;
 
+        if (user.locked)
+           return;
+
         let userName = user.get_user_name();
 
         if (!userName)
@@ -693,7 +697,7 @@ const SessionList = new Lang.Class({
     },
 
     _populate: function() {
-        this._itemList.destroy_children();
+        this._itemList.destroy_all_children();
         this._activeSessionId = null;
         this._items = {};
 

js/gdm/powerMenu.js

@@ -22,6 +22,8 @@ const Lang = imports.lang;
 const UPowerGlib = imports.gi.UPowerGlib;
 
 const ConsoleKit = imports.gdm.consoleKit;
+const Systemd = imports.gdm.systemd;
+
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
@@ -31,9 +33,13 @@ const PowerMenuButton = new Lang.Class({
 
     _init: function() {
         this.parent('system-shutdown', null);
-        this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
         this._upClient = new UPowerGlib.Client();
 
+        if (Systemd.haveSystemd())
+            this._systemdLoginManager = new Systemd.SystemdLoginManager();
+        else
+            this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
+
         this._createSubMenu();
 
         this._upClient.connect('notify::can-suspend',
@@ -54,56 +60,67 @@ const PowerMenuButton = new Lang.Class({
     },
 
     _updateVisibility: function() {
-        if (!this._haveSuspend && !this._haveShutdown && !this._haveRestart)
-            this.actor.hide();
-        else
-            this.actor.show();
+        let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
+        this.actor.visible = shouldBeVisible;
     },
 
     _updateHaveShutdown: function() {
-        this._consoleKitManager.CanStopRemote(Lang.bind(this,
-            function(result, error) {
-                if (!error)
-                    this._haveShutdown = result;
-                else
-                    this._haveShutdown = false;
 
-                if (this._haveShutdown) {
-                    this._powerOffItem.actor.show();
-                } else {
-                    this._powerOffItem.actor.hide();
-                }
+        if (Systemd.haveSystemd()) {
+            this._systemdLoginManager.CanPowerOffRemote(Lang.bind(this,
+                function(result, error) {
+                    if (!error)
+                        this._haveShutdown = result != 'no';
+                    else
+                        this._haveShutdown = false;
 
-                this._updateVisibility();
-            }));
+                    this._powerOffItem.actor.visible = this._haveShutdown;
+                    this._updateVisibility();
+                }));
+        } else {
+            this._consoleKitManager.CanStopRemote(Lang.bind(this,
+                function(result, error) {
+                    if (!error)
+                        this._haveShutdown = result;
+                    else
+                        this._haveShutdown = false;
+
+                    this._powerOffItem.actor.visible = this._haveShutdown;
+                    this._updateVisibility();
+                }));
+        }
     },
 
     _updateHaveRestart: function() {
-        this._consoleKitManager.CanRestartRemote(Lang.bind(this,
-            function(result, error) {
-                if (!error)
-                    this._haveRestart = result;
-                else
-                    this._haveRestart = false;
 
-                if (this._haveRestart) {
-                    this._restartItem.actor.show();
-                } else {
-                    this._restartItem.actor.hide();
-                }
+        if (Systemd.haveSystemd()) {
+            this._systemdLoginManager.CanRebootRemote(Lang.bind(this,
+                function(result, error) {
+                    if (!error)
+                        this._haveRestart = result != 'no';
+                    else
+                        this._haveRestart = false;
 
-                this._updateVisibility();
-            }));
+                    this._restartItem.actor.visible = this._haveRestart;
+                    this._updateVisibility();
+                }));
+        } else {
+            this._consoleKitManager.CanRestartRemote(Lang.bind(this,
+                function(result, error) {
+                    if (!error)
+                        this._haveRestart = result;
+                    else
+                        this._haveRestart = false;
+
+                    this._restartItem.actor.visible = this._haveRestart;
+                    this._updateVisibility();
+                }));
+        }
     },
 
     _updateHaveSuspend: function() {
         this._haveSuspend = this._upClient.get_can_suspend();
-
-        if (this._haveSuspend)
-            this._suspendItem.actor.show();
-        else
-            this._suspendItem.actor.hide();
-
+        this._suspendItem.actor.visible = this._haveSuspend;
         this._updateVisibility();
     },
 
@@ -132,12 +149,22 @@ const PowerMenuButton = new Lang.Class({
     },
 
     _onActivateRestart: function() {
-        if (this._haveRestart)
+        if (!this._haveRestart)
+            return;
+
+        if (Systemd.haveSystemd())
+            this._systemdLoginManager.RebootRemote(true);
+        else
             this._consoleKitManager.RestartRemote();
     },
 
     _onActivatePowerOff: function() {
-        if (this._haveShutdown)
+        if (!this._haveShutdown)
+            return;
+
+        if (Systemd.haveSystemd())
+            this._systemdLoginManager.PowerOffRemote(true);
+        else
             this._consoleKitManager.StopRemote();
     }
 });

js/gdm/systemd.js

@@ -0,0 +1,31 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+
+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='CanPowerOff'>
+    <arg type='s' direction='out'/>
+</method>
+<method name='CanReboot'>
+    <arg type='s' direction='out'/>
+</method>
+</interface>;
+
+const SystemdLoginManagerProxy = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
+
+function SystemdLoginManager() {
+    return new SystemdLoginManagerProxy(Gio.DBus.system,
+                                        'org.freedesktop.login1',
+                                        '/org/freedesktop/login1');
+};
+
+function haveSystemd() {
+    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
+}

js/misc/config.js.in

@@ -4,9 +4,14 @@
 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 */
-const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
+/* 1 if folks is available, 0 otherwise */
+const HAVE_FOLKS = @HAVE_FOLKS@;
+/* gettext package */
+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,136 +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;
-
-const DocInfo = new Lang.Class({
-    Name: 'DocInfo',
-
-    _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.
- */
-const DocManager = new Lang.Class({
-    Name: 'DocManager',
-
-    _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,199 @@
+// -*- 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 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');
+        }
+    }
+
+    // Encourage people to add this
+    if (!meta.url) {
+        log('Warning: Missing "url" property in %s/metadata.json'.format(uuid));
+    }
+
+    if (uuid != meta.uuid) {
+        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
+    }
+
+    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',
+
+    _scanExtensionsInDirectory: function(dir, type) {
+        let fileEnum;
+        let file, info;
+        try {
+            fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
+        } catch(e) {
+            logError(e, 'Could not enumerate extensions directory');
+            return;
+        }
+
+        while ((info = fileEnum.next_file(null)) != null) {
+            let fileType = info.get_file_type();
+            if (fileType != Gio.FileType.DIRECTORY)
+                continue;
+            let uuid = info.get_name();
+            let extensionDir = dir.get_child(uuid);
+
+            let existing = extensions[uuid];
+            if (existing) {
+                log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
+                continue;
+            }
+            let extension = createExtensionObject(uuid, extensionDir, type);
+            this.emit('extension-found', extension);
+        }
+        fileEnum.close(null);
+    },
+
+    scanExtensions: function() {
+        let userExtensionsDir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions']));
+        this._scanExtensionsInDirectory(userExtensionsDir, ExtensionType.PER_USER);
+
+        let systemDataDirs = GLib.get_system_data_dirs();
+        for (let i = 0; i < systemDataDirs.length; i++) {
+            let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
+            let dir = Gio.file_new_for_path(dirPath);
+            if (dir.query_exists(null))
+                this._scanExtensionsInDirectory(dir, ExtensionType.SYSTEM);
+        }
+    }
+});
+Signals.addSignalMethods(ExtensionFinder.prototype);

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" />
-<property name="client_id" type="s" access="read" />
-<property name="reason" type="s" access="read" />
-<property name="flags" type="u" access="read" />
-<property name="toplevel_xid" type="u" access="read" />
-<property name="cookie" type="u" access="read" />
+<method name="GetAppId">
+    <arg type="s" direction="out" />
+</method>
+<method name="GetReason">
+    <arg type="s" direction="out" />
+</method>
 </interface>;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);

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="s" direction="out" />
-    <arg type="s" direction="out" />
+    <arg type="(uss)" 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="s" direction="out" />
-    <arg type="u" direction="out" />
+    <arg type="(usu)" direction="out" />
 </method>
 <signal name="SignalQuality">
     <arg type="u" direction="out" />
@@ -72,7 +68,7 @@ const ModemGsm = new Lang.Class({
             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;
@@ -165,7 +161,7 @@ const ModemCdma = new Lang.Class({
 
         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');
 
@@ -187,7 +183,7 @@ const ModemCdma = new Lang.Class({
     },
 
     _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;

js/misc/util.js

@@ -83,24 +83,33 @@ function spawnCommandLine(command_line) {
 // this will throw an error.
 function trySpawn(argv)
 {
+    var success, pid;
     try {
-        GLib.spawn_async(null, argv, null,
-                         GLib.SpawnFlags.SEARCH_PATH,
-                         null, null);
+        [success, pid] = GLib.spawn_async(null, argv, null,
+                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                          null, null);
     } catch (err) {
-        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
-            err.message = _("Command not found");
-        } else {
+        /* Rewrite the error in case of ENOENT */
+        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
+            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:

js/ui/altTab.js

@@ -2,12 +2,14 @@
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
+const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -125,7 +127,7 @@ const AltTabPopup = new Lang.Class({
             if (childBox.x2 > primary.x + primary.width - rightPadding)
                 childBox.x2 = primary.x + primary.width - rightPadding;
             childBox.y1 = this._appSwitcher.actor.allocation.y2 + spacing;
-            this._thumbnails.addClones(primary.height - bottomPadding - childBox.y1);
+            this._thumbnails.addClones(primary.y + primary.height - bottomPadding - childBox.y1);
             let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
             childBox.y2 = childBox.y1 + childNaturalHeight;
             this._thumbnails.actor.allocate(childBox, flags);
@@ -139,7 +141,7 @@ const AltTabPopup = new Lang.Class({
 
         let screen = global.screen;
         let display = screen.get_display();
-        let windows = display.get_tab_list(Meta.TabList.NORMAL, screen,
+        let windows = display.get_tab_list(Meta.TabList.NORMAL_ALL, screen,
                                            screen.get_active_workspace());
 
         // windows is only the windows on the current workspace. For
@@ -264,7 +266,7 @@ const AltTabPopup = new Lang.Class({
 
     _keyPressEvent : function(actor, event) {
         let keysym = event.get_key_symbol();
-        let event_state = Shell.get_event_state(event);
+        let event_state = event.get_state();
         let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
         let action = global.display.get_keybinding_action(event.get_key_code(), event_state);
 
@@ -517,6 +519,7 @@ const AltTabPopup = new Lang.Class({
                                                         })
                          });
         this._thumbnails = null;
+        this._appSwitcher._items[this._currentApp].remove_accessible_state (Atk.StateType.EXPANDED);
     },
 
     _createThumbnails : function() {
@@ -537,6 +540,8 @@ const AltTabPopup = new Lang.Class({
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this, function () { this.thumbnailsVisible = true; })
                          });
+
+        this._appSwitcher._items[this._currentApp].add_accessible_state (Atk.StateType.EXPANDED);
     }
 });
 
@@ -561,14 +566,14 @@ const SwitcherList = new Lang.Class({
         this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this._list.connect('allocate', Lang.bind(this, this._allocate));
 
-        this._clipBin = new St.Bin({style_class: 'cbin'});
-        this._clipBin.child = this._list;
-        this.actor.add_actor(this._clipBin);
+        this._scrollView = new St.ScrollView({ style_class: 'hfade',
+                                               enable_mouse_scrolling: false });
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER);
 
-        this._leftGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-left', vertical: true});
-        this._rightGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-right', vertical: true});
-        this.actor.add_actor(this._leftGradient);
-        this.actor.add_actor(this._rightGradient);
+        let scrollBox = new St.BoxLayout();
+        scrollBox.add_actor(this._list);
+        this._scrollView.add_actor(scrollBox);
+        this.actor.add_actor(this._scrollView);
 
         // Those arrows indicate whether scrolling in one direction is possible
         this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
@@ -599,21 +604,9 @@ const SwitcherList = new Lang.Class({
         let childBox = new Clutter.ActorBox();
         let scrollable = this._minSize > box.x2 - box.x1;
 
-        this._clipBin.allocate(box, flags);
-
-        childBox.x1 = 0;
-        childBox.y1 = 0;
-        childBox.x2 = this._leftGradient.width;
-        childBox.y2 = this.actor.height;
-        this._leftGradient.allocate(childBox, flags);
-        this._leftGradient.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
-
-        childBox.x1 = (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
-        childBox.y1 = 0;
-        childBox.x2 = childBox.x1 + this._rightGradient.width;
-        childBox.y2 = this.actor.height;
-        this._rightGradient.allocate(childBox, flags);
-        this._rightGradient.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
+        box.y1 -= this.actor.get_theme_node().get_padding(St.Side.TOP);
+        box.y2 += this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+        this._scrollView.allocate(box, flags);
 
         let arrowWidth = Math.floor(leftPadding / 3);
         let arrowHeight = arrowWidth * 2;
@@ -622,7 +615,7 @@ const SwitcherList = new Lang.Class({
         childBox.x2 = childBox.x1 + arrowWidth;
         childBox.y2 = childBox.y1 + arrowHeight;
         this._leftArrow.allocate(childBox, flags);
-        this._leftArrow.opacity = this._leftGradient.opacity;
+        this._leftArrow.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
 
         arrowWidth = Math.floor(rightPadding / 3);
         arrowHeight = arrowWidth * 2;
@@ -631,7 +624,7 @@ const SwitcherList = new Lang.Class({
         childBox.x2 = childBox.x1 + arrowWidth;
         childBox.y2 = childBox.y1 + arrowHeight;
         this._rightArrow.allocate(childBox, flags);
-        this._rightArrow.opacity = this._rightGradient.opacity;
+        this._rightArrow.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
     },
 
     addItem : function(item, label) {
@@ -648,6 +641,8 @@ const SwitcherList = new Lang.Class({
         bbox.label_actor = label;
 
         this._items.push(bbox);
+
+        return bbox;
     },
 
     _onItemClicked: function (index) {
@@ -679,47 +674,66 @@ const SwitcherList = new Lang.Class({
                 this._items[this._highlighted].add_style_pseudo_class('selected');
         }
 
+        let adjustment = this._scrollView.hscroll.adjustment;
+        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
         let [absItemX, absItemY] = this._items[index].get_transformed_position();
         let [result, posX, posY] = this.actor.transform_stage_point(absItemX, 0);
         let [containerWidth, containerHeight] = this.actor.get_transformed_size();
         if (posX + this._items[index].get_width() > containerWidth)
             this._scrollToRight();
-        else if (posX < 0)
+        else if (this._items[index].allocation.x1 - value < 0)
             this._scrollToLeft();
 
     },
 
     _scrollToLeft : function() {
-        let x = this._items[this._highlighted].allocation.x1;
+        let adjustment = this._scrollView.hscroll.adjustment;
+        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+
+        let item = this._items[this._highlighted];
+
+        if (item.allocation.x1 < value)
+            value = Math.min(0, item.allocation.x1);
+        else if (item.allocation.x2 > value + pageSize)
+            value = Math.max(upper, item.allocation.x2 - pageSize);
+
         this._scrollableRight = true;
-        Tweener.addTween(this._list, { anchor_x: x,
-                                        time: POPUP_SCROLL_TIME,
-                                        transition: 'easeOutQuad',
-                                        onComplete: Lang.bind(this, function () {
-                                                                        if (this._highlighted == 0) {
-                                                                            this._scrollableLeft = false;
-                                                                            this.actor.queue_relayout();
-                                                                        }
-                                                             })
-                        });
+        Tweener.addTween(adjustment,
+                         { value: value,
+                           time: POPUP_SCROLL_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function () {
+                                if (this._highlighted == 0) {
+                                    this._scrollableLeft = false;
+                                    this.actor.queue_relayout();
+                                }
+                           })
+                          });
     },
 
     _scrollToRight : function() {
+        let adjustment = this._scrollView.hscroll.adjustment;
+        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+
+        let item = this._items[this._highlighted];
+
+        if (item.allocation.x1 < value)
+            value = Math.max(0, item.allocation.x1);
+        else if (item.allocation.x2 > value + pageSize)
+            value = Math.min(upper, item.allocation.x2 - pageSize);
+
         this._scrollableLeft = true;
-        let monitor = Main.layoutManager.primaryMonitor;
-        let padding = this.actor.get_theme_node().get_horizontal_padding();
-        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
-        let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + parentPadding;
-        Tweener.addTween(this._list, { anchor_x: x,
-                                        time: POPUP_SCROLL_TIME,
-                                        transition: 'easeOutQuad',
-                                        onComplete: Lang.bind(this, function () {
-                                                                        if (this._highlighted == this._items.length - 1) {
-                                                                            this._scrollableRight = false;
-                                                                            this.actor.queue_relayout();
-                                                                        }
-                                                             })
-                        });
+        Tweener.addTween(adjustment,
+                         { value: value,
+                           time: POPUP_SCROLL_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function () {
+                                if (this._highlighted == this._items.length - 1) {
+                                    this._scrollableRight = false;
+                                    this.actor.queue_relayout();
+                                }
+                            })
+                          });
     },
 
     _itemActivated: function(n) {
@@ -805,14 +819,6 @@ const SwitcherList = new Lang.Class({
 
         let primary = Main.layoutManager.primaryMonitor;
         let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
-        if (this.actor.allocation.x2 == primary.x + primary.width - parentRightPadding) {
-            if (this._squareItems)
-                childWidth = childHeight;
-            else {
-                let [childMin, childNat] = children[0].get_preferred_width(childHeight);
-                childWidth = childMin;
-            }
-        }
 
         for (let i = 0; i < children.length; i++) {
             if (this._items.indexOf(children[i]) != -1) {
@@ -838,14 +844,6 @@ const SwitcherList = new Lang.Class({
                 // we don't allocate it.
             }
         }
-
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-        let topPadding = this.actor.get_theme_node().get_padding(St.Side.TOP);
-        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-
-        // Clip the area for scrolling
-        this._clipBin.set_clip(0, -topPadding, (this.actor.allocation.x2 - this.actor.allocation.x1) - leftPadding - rightPadding, this.actor.height + bottomPadding);
     }
 });
 
@@ -1025,7 +1023,7 @@ const AppSwitcher = new Lang.Class({
 
     _addIcon : function(appIcon) {
         this.icons.push(appIcon);
-        this.addItem(appIcon.actor, appIcon.label);
+        let item = this.addItem(appIcon.actor, appIcon.label);
 
         let n = this._arrows.length;
         let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
@@ -1035,6 +1033,8 @@ const AppSwitcher = new Lang.Class({
 
         if (appIcon.cachedWindows.length == 1)
             arrow.hide();
+        else
+            item.add_accessible_state (Atk.StateType.EXPANDABLE);
     }
 });
 

js/ui/appDisplay.js

@@ -10,6 +10,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;
@@ -21,6 +22,7 @@ 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;
@@ -35,6 +37,7 @@ const AlphabeticalView = new Lang.Class({
 
         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 });
@@ -59,16 +62,22 @@ const AlphabeticalView = new Lang.Class({
             }));
     },
 
-    _removeAll: function() {
+    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;
@@ -119,14 +128,6 @@ const AlphabeticalView = new Lang.Class({
                 icon.actor.visible = true;
             }
         }
-    },
-
-    setAppList: function(apps) {
-        this._removeAll();
-        for (var i = 0; i < apps.length; i++) {
-            var app = apps[i];
-            this._addApp(app);
-         }
     }
 });
 
@@ -146,9 +147,10 @@ const ViewByCategories = new Lang.Class({
         // (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' });
@@ -201,27 +203,30 @@ const ViewByCategories = new Lang.Class({
             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())
-                    this._loadCategory(iter.get_directory(), appList);
+                var itemDir = iter.get_directory();
+                if (!itemDir.get_is_nodisplay())
+                    this._loadCategory(itemDir, appList);
             }
         }
     },
 
-    _addCategory: function(name, index, dir, allApps) {
+    _addCategory: function(name, index, dir) {
         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 = [];
@@ -235,20 +240,16 @@ const ViewByCategories = new Lang.Class({
     },
 
     _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();
@@ -266,7 +267,6 @@ const ViewByCategories = new Lang.Class({
             }
         }
 
-        this._view.setAppList(allApps);
         this._selectCategory(-1);
 
         if (this._focusDummy) {
@@ -308,25 +308,29 @@ const AppSearchProvider = new Lang.Class({
 
     _init: function() {
         this.parent(_("APPLICATIONS"));
-
         this._appSys = Shell.AppSystem.get_default();
     },
 
-    getResultMeta: function(app) {
-        return { 'id': app,
-                 'name': app.get_name(),
-                 'createIcon': function(size) {
-                                   return app.create_icon_texture(size);
-                               }
-               };
+    getResultMetas: function(apps, callback) {
+        let metas = [];
+        for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
+            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) {
@@ -334,7 +338,7 @@ const AppSearchProvider = new Lang.Class({
                                         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)
@@ -369,21 +373,26 @@ const SettingsSearchProvider = new Lang.Class({
         this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
     },
 
-    getResultMeta: function(pref) {
-        return { 'id': pref,
-                 'name': pref.get_name(),
-                 'createIcon': function(size) {
-                                   return pref.create_icon_texture(size);
-                               }
-               };
+    getResultMetas: function(prefs, callback) {
+        let metas = [];
+        for (let i = 0; i < prefs.length; i++) {
+            let pref = prefs[i];
+            metas.push({ 'id': pref,
+                         'name': pref.get_name(),
+                         'createIcon': function(size) {
+                             return pref.create_icon_texture(size);
+                         }
+                       });
+        }
+        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) {
@@ -574,7 +583,7 @@ const AppWellIcon = new Lang.Class({
 
     _onActivate: function (event) {
         this.emit('launching');
-        let modifiers = Shell.get_event_state(event);
+        let modifiers = event.get_state();
 
         if (this._onActivateOverride) {
             this._onActivateOverride(event);
@@ -614,7 +623,7 @@ const AppIconMenu = new Lang.Class({
 
     _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;
 
         this.parent(source.actor, 0.5, side);

js/ui/automountManager.js

@@ -2,9 +2,11 @@
 
 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 Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 const ScreenSaver = imports.misc.screenSaver;
@@ -43,7 +45,7 @@ function ConsoleKitManager() {
                                    g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
                                              Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
 
-    self.connect('notify::g-name-owner', function() {
+    self._updateSessionActive = function() {
         if (self.g_name_owner) {
             self.GetCurrentSessionRemote(function([session]) {
                 self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
@@ -58,12 +60,19 @@ function ConsoleKitManager() {
         } else {
             self.sessionActive = true;
         }
-    });
+    };
+    self.connect('notify::g-name-owner',
+                 Lang.bind(self, self._updateSessionActive));
 
+    self._updateSessionActive();
     self.init(null);
     return self;
 }
 
+function haveSystemd() {
+    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
+}
+
 const AutomountManager = new Lang.Class({
     Name: 'AutomountManager',
 
@@ -71,7 +80,8 @@ const AutomountManager = new Lang.Class({
         this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
         this._volumeQueue = [];
 
-        this.ckListener = new ConsoleKitManager();
+        if (!haveSystemd())
+            this.ckListener = new ConsoleKitManager();
 
         this._ssProxy = new ScreenSaver.ScreenSaverProxy();
         this._ssProxy.connectSignal('ActiveChanged',
@@ -113,17 +123,29 @@ const AutomountManager = new Lang.Class({
         let volumes = this._volumeMonitor.get_volumes();
         volumes.forEach(Lang.bind(this, function(volume) {
             this._checkAndMountVolume(volume, { checkSession: false,
-                                                useMountOp: false });
+                                                useMountOp: false,
+                                                allowAutorun: false });
         }));
 
         return false;
     },
 
+    isSessionActive: function() {
+        // Return whether the current session is active, using the
+        // right mechanism: either systemd if available or ConsoleKit
+        // as fallback.
+
+        if (haveSystemd())
+            return Shell.session_is_active_for_systemd();
+
+        return this.ckListener.sessionActive;
+    },
+
     _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.isSessionActive())
+            return;
 
         if (this._ssProxy.screenSaverActive)
             return;
@@ -134,8 +156,8 @@ const AutomountManager = new Lang.Class({
     _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.isSessionActive())
+            return;
 
         if (this._ssProxy.screenSaverActive)
             return;
@@ -146,7 +168,7 @@ const AutomountManager = new Lang.Class({
     _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)
+        if (!this.isSessionActive())
             return;
 
         // we force stop/eject in this case, so we don't have to pass a
@@ -180,12 +202,13 @@ const AutomountManager = new Lang.Class({
 
     _checkAndMountVolume: function(volume, params) {
         params = Params.parse(params, { checkSession: true,
-                                        useMountOp: true });
+                                        useMountOp: true,
+                                        allowAutorun: true });
 
         if (params.checkSession) {
             // if we're not in the current ConsoleKit session,
             // don't attempt automount
-            if (!this.ckListener.sessionActive)
+            if (!this.isSessionActive())
                 return;
 
             if (this._ssProxy.screenSaverActive) {
@@ -215,15 +238,20 @@ const AutomountManager = new Lang.Class({
 
         if (params.useMountOp) {
             let operation = new ShellMountOperation.ShellMountOperation(volume);
-            this._mountVolume(volume, operation.mountOp);
+            this._mountVolume(volume, operation, params.allowAutorun);
         } else {
-            this._mountVolume(volume, null);
+            this._mountVolume(volume, null, params.allowAutorun);
         }
     },
 
-    _mountVolume: function(volume, operation) {
-        this._allowAutorun(volume);
-        volume.mount(0, operation, null,
+    _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));
     },
 
@@ -232,15 +260,19 @@ const AutomountManager = new Lang.Class({
 
         try {
             volume.mount_finish(res);
+            this._closeOperation(volume);
         } 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)
+            // 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
-                log('Unable to mount volume ' + volume.get_name() + ': ' + string);
+            } else {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+
+                this._closeOperation(volume);
+            }
         }
     },
 
@@ -252,8 +284,16 @@ const AutomountManager = new Lang.Class({
     },
 
     _reaskPassword: function(volume) {
-        let operation = new ShellMountOperation.ShellMountOperation(volume, { reaskPassword: true });
-        this._mountVolume(volume, operation.mountOp);        
+        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) {

js/ui/autorunManager.js

@@ -23,12 +23,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)) ||
-        (volume && volume.allowAutorun && volume.should_automount()))
+    if (!volume || (!volume.allowAutorun && forTransient))
+        return false;
+
+    if (!root.is_native() || isMountRootHidden(root))
         return false;
 
     return true;
@@ -174,7 +176,7 @@ const AutorunManager = new Lang.Class({
     _onMountAdded: function(monitor, mount) {
         // don't do anything if our session is not the currently
         // active one
-        if (!Main.automountManager.ckListener.sessionActive)
+        if (!Main.automountManager.isSessionActive())
             return;
 
         let discoverer = new ContentTypeDiscoverer(Lang.bind (this,
@@ -224,11 +226,9 @@ const AutorunManager = new Lang.Class({
         try {
             mount.unmount_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to eject the mount ' + mount.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the mount ' + mount.get_name() 
+                    + ': ' + e.toString());
         }
     },
 
@@ -236,11 +236,9 @@ const AutorunManager = new Lang.Class({
         try {
             source.eject_with_operation_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to eject the drive ' + source.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the drive ' + source.get_name()
+                    + ': ' + e.toString());
         }
     },
 
@@ -248,11 +246,9 @@ const AutorunManager = new Lang.Class({
         try {
             drive.stop_finish(res);
         } catch (e) {
-            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
-            // but we can't access the error code from JS.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
-            log('Unable to stop the drive ' + drive.get_name() 
-                + ': ' + e.toString());
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to stop the drive ' + drive.get_name() 
+                    + ': ' + e.toString());
         }
     },
 });
@@ -262,16 +258,15 @@ const AutorunResidentSource = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function() {
-        this.parent(_("Removable Devices"));
+        this.parent(_("Removable Devices"), 'media-removable', St.IconType.FULLCOLOR);
 
         this._mounts = [];
 
         this._notification = new AutorunResidentNotification(this);
-        this._setSummaryIcon(this.createNotificationIcon());
     },
 
     addMount: function(mount, apps) {
-        if (ignoreAutorunForMount(mount))
+        if (!shouldAutorunMount(mount, false))
             return;
 
         let filtered = this._mounts.filter(function (element) {
@@ -310,12 +305,6 @@ const AutorunResidentSource = new Lang.Class({
             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 });
     }
 });
 
@@ -339,7 +328,7 @@ const AutorunResidentNotification = new Lang.Class({
 
     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];
@@ -455,7 +444,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             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]);
@@ -500,11 +489,11 @@ const AutorunTransientSource = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function(mount, apps) {
-        this.parent(mount.get_name());
-
         this.mount = mount;
         this.apps = apps;
 
+        this.parent(mount.get_name());
+
         this._notification = new AutorunTransientNotification(this);
         this._setSummaryIcon(this.createNotificationIcon());
 

js/ui/boxpointer.js

@@ -45,6 +45,21 @@ const BoxPointer = new Lang.Class({
         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) {
@@ -75,7 +90,11 @@ const BoxPointer = new Lang.Class({
                                  xOffset: 0,
                                  yOffset: 0,
                                  transition: 'linear',
-                                 onComplete: onComplete,
+                                 onComplete: Lang.bind(this, function() {
+                                     this._unmuteInput();
+                                     if (onComplete)
+                                         onComplete();
+                                 }),
                                  time: POPUP_ANIMATION_TIME });
     },
 
@@ -102,6 +121,8 @@ const BoxPointer = new Lang.Class({
             }
         }
 
+        this._muteInput();
+
         Tweener.addTween(this, { opacity: 0,
                                  xOffset: xOffset,
                                  yOffset: yOffset,

js/ui/calendar.js

@@ -406,7 +406,7 @@ const Calendar = new Lang.Class({
 
     _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();
@@ -448,7 +448,7 @@ const Calendar = new Lang.Class({
         }
 
         // 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) {
@@ -685,7 +685,7 @@ const EventsList = new Lang.Class({
     },
 
     _showOtherDay: function(day) {
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
@@ -702,7 +702,7 @@ const EventsList = new Lang.Class({
     },
 
     _showToday: function() {
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         let now = new Date();
         let dayBegin = _getBeginningOfDay(now);

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/contactDisplay.js

@@ -5,6 +5,7 @@ const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const Util = imports.misc.util;
 const IconGrid = imports.ui.iconGrid;
@@ -29,7 +30,9 @@ const Contact = new Lang.Class({
 
         this.actor = new St.Bin({ style_class: 'contact',
                                   reactive: true,
-                                  track_hover: true });
+                                  can_focus: true,
+                                  track_hover: true,
+                                  accessible_role: Atk.Role.PUSH_BUTTON });
 
         let content = new St.BoxLayout( { style_class: 'contact-content',
                                           vertical: false });
@@ -60,7 +63,7 @@ const Contact = new Lang.Class({
                         this.individual.full_name ||
                         this.individual.nickname  ||
                         email                     ||
-                        _("Unknown");
+                        C_("contact", "Unknown");
         let aliasLabel = new St.Label({ text: aliasText,
                                         style_class: 'contact-details-alias' });
         details.add(aliasLabel, { x_fill: true,
@@ -68,6 +71,8 @@ const Contact = new Lang.Class({
                                   x_align: St.Align.START,
                                   y_align: St.Align.START });
 
+        this.actor.label_actor = aliasLabel;
+
         let presence = this._createPresence(this.individual.presence_type);
         details.add(presence, { x_fill: false,
                                 y_fill: true,
@@ -93,23 +98,30 @@ const Contact = new Lang.Class({
             text = _("Busy");
             iconName = 'user-busy';
             break;
-          default:
+          case Folks.PresenceType.OFFLINE:
             text = _("Offline");
             iconName = 'user-offline';
+            break;
+          default:
+            text = '';
+            iconName = null;
           }
 
-        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 });
+
+        if (iconName) {
+            let icon = new St.Icon({ icon_name: iconName,
+                                     icon_type: St.IconType.FULLCOLOR,
+                                     icon_size: 16,
+                                     style_class: 'contact-details-status-icon' });
+            box.add(icon, { x_fill: true,
+                            y_fill: false,
+                            x_align: St.Align.START,
+                            y_align: St.Align.START });
+        }
+
+        let label = new St.Label({ text: text });
 
         box.add(label, { x_fill: true,
                          y_fill: false,
@@ -142,22 +154,26 @@ const ContactSearchProvider = new Lang.Class({
         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);
-                 }
-        };
+    getResultMetas: function(ids, callback) {
+        let metas = [];
+        for (let i = 0; i < ids.length; i++) {
+            let contact = new Contact(ids[i]);
+            metas.push({ 'id': ids[i],
+                         'name': contact.alias,
+                         'createIcon': function(size) {
+                             return contact.createIcon(size);
+                         }
+                       });
+        }
+        callback(metas);
     },
 
     getInitialResultSet: function(terms) {
-        return this._contactSys.initial_search(terms);
+        this.searchSystem.pushResults(this, this._contactSys.initial_search(terms));
     },
 
     getSubsearchResultSet: function(previousResults, terms) {
-        return this._contactSys.subsearch(previousResults, terms);
+        this.searchSystem.pushResults(this, this._contactSys.subsearch(previousResults, terms));
     },
 
     createResultActor: function(resultMeta, terms) {

js/ui/ctrlAltTab.js

@@ -233,7 +233,7 @@ const CtrlAltTabPopup = new Lang.Class({
 
     _keyPressEvent : function(actor, event) {
         let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        let shift = (event.get_state() & Clutter.ModifierType.SHIFT_MASK);
         if (shift && keysym == Clutter.KEY_Tab)
             keysym = Clutter.ISO_Left_Tab;
 

js/ui/dash.js

@@ -36,7 +36,7 @@ const DashItemContainer = new Lang.Class({
                            Lang.bind(this, this._allocate));
         this.actor._delegate = this;
 
-        this._label = null;
+        this.label = null;
 
         this.child = null;
         this._childScale = 1;
@@ -91,32 +91,32 @@ const DashItemContainer = new Lang.Class({
     },
 
     showLabel: function() {
-        if (this._label == null)
+        if (this.label == null)
             return;
 
-        this._label.opacity = 0;
-        this._label.show();
+        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 labelHeight = this.label.get_height();
         let yOffset = Math.floor((itemHeight - labelHeight) / 2)
 
         let y = stageY + yOffset;
 
-        let node = this._label.get_theme_node();
+        let node = this.label.get_theme_node();
         let xOffset = node.get_length('-x-offset');
 
         let x;
-        if (St.Widget.get_default_direction () == St.TextDirection.RTL)
-            x = stageX - this._label.get_width() - xOffset;
+        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,
+        this.label.set_position(x, y);
+        Tweener.addTween(this.label,
                          { opacity: 255,
                            time: DASH_ITEM_LABEL_SHOW_TIME,
                            transition: 'easeOutQuad',
@@ -124,22 +124,22 @@ const DashItemContainer = new Lang.Class({
     },
 
     setLabelText: function(text) {
-        if (this._label == null)
-            this._label = new St.Label({ style_class: 'dash-label'});
+        if (this.label == null)
+            this.label = new St.Label({ style_class: 'dash-label'});
 
-        this._label.set_text(text);
-        Main.layoutManager.addChrome(this._label);
-        this._label.hide();
+        this.label.set_text(text);
+        Main.layoutManager.addChrome(this.label);
+        this.label.hide();
     },
 
     hideLabel: function () {
-        this._label.opacity = 255;
-        Tweener.addTween(this._label,
+        this.label.opacity = 255;
+        Tweener.addTween(this.label,
                          { opacity: 0,
                            time: DASH_ITEM_LABEL_HIDE_TIME,
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this, function() {
-                               this._label.hide();
+                               this.label.hide();
                            })
                          });
     },
@@ -148,7 +148,7 @@ const DashItemContainer = new Lang.Class({
         if (this.child == actor)
             return;
 
-        this.actor.destroy_children();
+        this.actor.destroy_all_children();
 
         this.child = actor;
         this.actor.add_actor(this.child);
@@ -168,7 +168,17 @@ const DashItemContainer = new Lang.Class({
                          });
     },
 
+    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;
@@ -298,7 +308,9 @@ const Dash = new Lang.Class({
         this._dragPlaceholderPos = -1;
         this._animatingPlaceholdersCount = 0;
         this._favRemoveTarget = null;
-        this._labelTimeoutId = 0;
+        this._showLabelTimeoutId = 0;
+        this._resetHoverTimeoutId = 0;
+        this._labelShowing = false;
 
         this._box = new St.BoxLayout({ name: 'dash',
                                        vertical: true,
@@ -385,6 +397,7 @@ const Dash = new Lang.Class({
         let srcIsFavorite = (id in favorites);
 
         if (srcIsFavorite &&
+            app.get_state() != Shell.AppState.RUNNING &&
             dragEvent.source.actor &&
             this.actor.contains (dragEvent.source.actor) &&
             this._favRemoveTarget == null) {
@@ -437,6 +450,9 @@ const Dash = new Lang.Class({
         item.setChild(display.actor);
 
         item.setLabelText(app.get_name());
+        // Override default AppWellIcon label_actor
+        display.actor.label_actor = item.label;
+
 
         display.icon.setIconSize(this.iconSize);
         display.actor.connect('notify::hover',
@@ -448,18 +464,31 @@ const Dash = new Lang.Class({
 
     _onHover: function (item, display) {
         if (display.actor.get_hover() && !display.isMenuUp) {
-            if (this._labelTimeoutId == 0) {
-                this._labelTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
+            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._labelTimeoutId > 0)
-                Mainloop.source_remove(this._labelTimeoutId);
-            this._labelTimeoutId = 0;
+            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;
+                    }));
+            }
         }
     },
 
@@ -486,7 +515,7 @@ const Dash = new Lang.Class({
             return;
 
 
-        let themeNode = this.actor.get_theme_node();
+        let themeNode = this._box.get_theme_node();
         let maxAllocation = new Clutter.ActorBox({ x1: 0, y1: 0,
                                                    x2: 42 /* whatever */,
                                                    y2: this._maxHeight });
@@ -662,8 +691,8 @@ const Dash = new Lang.Class({
         }
 
         for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_actor(addedItems[i].item.actor,
-                                   addedItems[i].pos);
+            this._box.insert_child_at_index(addedItems[i].item.actor,
+                                            addedItems[i].pos);
 
         for (let i = 0; i < removedActors.length; i++) {
             let item = removedActors[i]._delegate;
@@ -672,7 +701,7 @@ const Dash = new Lang.Class({
             if (Main.overview.visible)
                 item.animateOutAndDestroy();
             else
-                item.actor.destroy();
+                item.destroy();
         }
 
         this._adjustIconSize();
@@ -728,20 +757,10 @@ const Dash = new Lang.Class({
             numChildren--;
         }
 
-        let pos = Math.round(y * numChildren / boxHeight);
+        let pos = Math.floor(y * numChildren / boxHeight);
 
-        if (pos != this._dragPlaceholderPos && pos <= numFavorites) {
-            if (this._animatingPlaceholdersCount > 0) {
-                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;
-            }
+        if (pos != this._dragPlaceholderPos && pos <= numFavorites && this._animatingPlaceholdersCount == 0) {
+            this._dragPlaceholderPos = pos;
 
             // Don't allow positioning before or after self
             if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
@@ -772,12 +791,20 @@ const Dash = new Lang.Class({
             this._dragPlaceholder = new DragPlaceholderItem();
             this._dragPlaceholder.child.set_width (this.iconSize);
             this._dragPlaceholder.child.set_height (this.iconSize / 2);
-            this._box.insert_actor(this._dragPlaceholder.actor,
-                                   this._dragPlaceholderPos);
+            this._box.insert_child_at_index(this._dragPlaceholder.actor,
+                                            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)
@@ -820,6 +847,11 @@ const Dash = new Lang.Class({
                 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();

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)
 {
@@ -44,20 +38,23 @@ const DateMenuButton = new Lang.Class({
     Name: 'DateMenuButton',
     Extends: PanelMenu.Button,
 
-    _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;
         this.parent(menuAlignment);
 
-        this._clock = new St.Label();
-        this.actor.add_actor(this._clock);
+        // At this moment calendar menu is not keyboard navigable at
+        // all (so not accessible), so it doesn't make sense to set as
+        // role ATK_ROLE_MENU like other elements of the panel.
+        this.actor.accessible_role = Atk.Role.LABEL;
+
+        this._clockDisplay = new St.Label();
+        this.actor.add_actor(this._clockDisplay);
 
         hbox = new St.BoxLayout({name: 'calendarArea' });
         this.menu.addActor(hbox);
@@ -69,10 +66,11 @@ const DateMenuButton = new Lang.Class({
 
         // 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) {
+        if (Main.sessionMode.showCalendarEvents) {
             this._eventSource = new Calendar.DBusEventSource();
             this._eventList = new Calendar.EventsList(this._eventSource);
         } else {
@@ -103,7 +101,7 @@ const DateMenuButton = new Lang.Class({
             item.actor.reparent(vbox);
         }
 
-        if (params.showEvents) {
+        if (Main.sessionMode.showCalendarEvents) {
             // Add vertical separator
 
             item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
@@ -150,68 +148,13 @@ const DateMenuButton = new Lang.Class({
 
         // Done with hbox for calendar and event list
 
-        // Track changes to clock settings
-        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        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._clock = new GnomeDesktop.WallClock();
+        this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
         this._updateClockAndDate();
     },
 
     _updateClockAndDate: function() {
-        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        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");
-        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
-
-        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
-        return false;
+        this._clockDisplay.set_text(this._clock.clock);
     },
 
     _onOpenCalendarActivate: function() {

js/ui/dnd.js

@@ -103,8 +103,8 @@ const _Draggable = new Lang.Class({
         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
-        // tooltips. But we remember the actors that we first left/last entered so we can
+        // During the drag, we eat enter/leave events so that actors don't prelight.
+        // But we remember the actors that we first left/last entered so we can
         // fix up the hover state after the drag ends.
         this._firstLeaveActor = null;
         this._lastEnterActor = null;
@@ -120,13 +120,7 @@ const _Draggable = new Lang.Class({
             return false;
 
         this._buttonDown = true;
-        // special case St.Button: grabbing the pointer would mess up the
-        // 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();
+        this._grabActor();
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -135,15 +129,6 @@ const _Draggable = new Lang.Class({
         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',
@@ -232,6 +217,13 @@ const _Draggable = new Lang.Class({
         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();

js/ui/docDisplay.js

@@ -1,44 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const DocInfo = imports.misc.docInfo;
-const Lang = imports.lang;
-const Params = imports.misc.params;
-const Search = imports.ui.search;
-
-const DocSearchProvider = new Lang.Class({
-    Name: 'DocSearchProvider',
-    Extends: Search.SearchProvider,
-
-    _init: function(name) {
-        this.parent(_("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,7 +31,6 @@ 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;
@@ -116,30 +115,12 @@ 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 = [];
-
-    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;
+    return Shell.AppSystem.get_default().lookup_heuristic_basename(desktopFile);
 }
 
 const ListItem = new Lang.Class({
@@ -306,13 +287,13 @@ const EndSessionDialog = new Lang.Class({
 
         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();
                                       }));
 
@@ -333,7 +314,8 @@ const EndSessionDialog = new Lang.Class({
         this._iconBin.child = null;
         if (iconFile) {
             this._iconBin.show();
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
+            this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                    'background-size: contain;');
         } else {
             this._iconBin.hide();
         }
@@ -359,7 +341,7 @@ const EndSessionDialog = new Lang.Class({
         }
     },
 
-    _updateContent: function() {
+    _updateDescription: function() {
         if (this.state != ModalDialog.State.OPENING &&
             this.state != ModalDialog.State.OPENED)
             return;
@@ -369,17 +351,6 @@ const EndSessionDialog = new Lang.Class({
         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;
@@ -412,6 +383,27 @@ const EndSessionDialog = new Lang.Class({
         _setLabelText(this._descriptionLabel, description);
     },
 
+    _updateContent: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
+            return;
+
+        let dialogContent = DialogContent[this._type];
+
+        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);
+        }
+
+        this._updateDescription();
+    },
+
     _updateButtons: function() {
         let dialogContent = DialogContent[this._type];
         let buttons = [{ action: Lang.bind(this, this.cancel),
@@ -458,7 +450,7 @@ const EndSessionDialog = new Lang.Class({
                          { _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];
@@ -481,7 +473,8 @@ const EndSessionDialog = new Lang.Class({
         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());
@@ -500,11 +493,11 @@ const EndSessionDialog = new Lang.Class({
         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;
         }
@@ -520,7 +513,7 @@ const EndSessionDialog = new Lang.Class({
         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;
         }

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)
-            return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
-        else
+        try {
+            if ('actor' in this && this.actor instanceof Clutter.Actor)
+                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,170 @@
+// -*- 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 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/';
+
+let _httpSession;
+
+function installExtensionFromUUID(uuid) {
+    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) {
+                                   let info = JSON.parse(message.response_body.data);
+                                   let dialog = new InstallExtensionDialog(uuid, info);
+                                   dialog.open(global.get_current_time());
+                               });
+}
+
+function uninstallExtensionFromUUID(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(uuid))
+        return false;
+
+    FileUtils.recursivelyDeleteDir(extension.dir);
+    return true;
+}
+
+function gotExtensionZipFile(session, message, uuid) {
+    if (message.status_code != Soup.KnownStatusCode.OK) {
+        logExtensionError(uuid, 'downloading extension: ' + message.status_code);
+        return;
+    }
+
+    let dir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));
+    try {
+        if (!dir.query_exists(null))
+            dir.make_directory_with_parents(null);
+    } catch (e) {
+        logExtensionError('Could not create extension directory');
+    }
+
+    let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
+    let contents = message.response_body.flatten().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) {
+        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(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+        if (enabledExtensions.indexOf(uuid) == -1) {
+            enabledExtensions.push(uuid);
+            global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+        }
+
+        ExtensionSystem.loadExtension(dir, ExtensionUtils.ExtensionType.PER_USER, true);
+    });
+}
+
+const InstallExtensionDialog = new Lang.Class({
+    Name: 'InstallExtensionDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(uuid, info) {
+        this.parent({ styleClass: 'extension-dialog' });
+
+        this._uuid = uuid;
+        this._info = info;
+
+        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(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());
+
+        // 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: ExtensionSystem.ExtensionState.UNINSTALLED,
+                     error: '' };
+
+        _signals.emit('extension-state-changed', meta);
+    },
+
+    _onInstallButtonPressed: function(button, event) {
+        let state = { uuid: this._uuid,
+                      state: ExtensionSystem.ExtensionState.DOWNLOADING,
+                      error: '' };
+
+        _signals.emit('extension-state-changed', state);
+
+        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);
+
+        _httpSession.queue_message(message,
+                                   Lang.bind(this, function(session, message) {
+                                       gotExtensionZipFile(session, message, this._uuid);
+                                   }));
+
+        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,11 @@
 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 FileUtils = imports.misc.fileUtils;
-const ModalDialog = imports.ui.modalDialog;
-
-const API_VERSION = 1;
+const ExtensionUtils = imports.misc.extensionUtils;
 
 const ExtensionState = {
     ENABLED: 1,
@@ -29,47 +22,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
-var userExtensionsDir = null;
+// Contains the order that extensions were enabled in.
+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 +36,16 @@ 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';
 
-/**
- * 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 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, ExtensionType.PER_USER, true);
-    });
-}
-
 function disableExtension(uuid) {
-    let meta = extensionMeta[uuid];
-    if (!meta)
+    let extension = ExtensionUtils.extensions[uuid];
+    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,14 +61,19 @@ 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());
         }
     }
 
+    if (extension.stylesheet) {
+        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
+        theme.unload_stylesheet(extension.stylesheet.get_path());
+    }
+
     try {
-        extensionState.disable();
+        extension.stateObj.disable();
     } catch(e) {
         logExtensionError(uuid, e.toString());
         return;
@@ -247,7 +82,7 @@ function disableExtension(uuid) {
     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());
         }
@@ -255,165 +90,135 @@ function disableExtension(uuid) {
 
     extensionOrder.splice(orderIdx, 1);
 
-    meta.state = ExtensionState.DISABLED;
-    _signals.emit('extension-state-changed', meta);
+    extension.state = ExtensionState.DISABLED;
+    _signals.emit('extension-state-changed', extension);
 }
 
 function enableExtension(uuid) {
-    let meta = extensionMeta[uuid];
-    if (!meta)
+    let extension = ExtensionUtils.extensions[uuid];
+    if (!extension)
         return;
 
-    if (meta.state == ExtensionState.INITIALIZED) {
-        loadExtension(meta.dir, meta.type, true);
-        return;
-    }
+    if (extension.state == ExtensionState.INITIALIZED)
+        initExtension(uuid);
 
-    if (meta.state != ExtensionState.DISABLED)
+    if (extension.state != ExtensionState.DISABLED)
         return;
 
-    let extensionState = extensionStateObjs[uuid];
-
     extensionOrder.push(uuid);
 
     try {
-        extensionState.enable();
+        extension.stateObj.enable();
     } catch(e) {
         logExtensionError(uuid, e.toString());
         return;
     }
 
-    meta.state = ExtensionState.ENABLED;
-    _signals.emit('extension-state-changed', meta);
+    let stylesheetFile = extension.dir.get_child('stylesheet.css');
+    if (stylesheetFile.query_exists(null)) {
+        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
+        try {
+            theme.load_stylesheet(stylesheetFile.get_path());
+            extension.stylesheet = stylesheetFile;
+        } catch (e) {
+            logExtensionError(uuid, 'Stylesheet parse error: ' + e);
+        }
+    }
+
+    extension.state = ExtensionState.ENABLED;
+    _signals.emit('extension-state-changed', extension);
 }
 
 function logExtensionError(uuid, message, state) {
-    if (!errors[uuid]) errors[uuid] = [];
-    errors[uuid].push(message);
-    global.logError('Extension "%s" had error: %s'.format(uuid, message));
+    let extension = ExtensionUtils.extensions[uuid];
+    if (!extension)
+        return;
+
+    if (!extension.errors)
+        extension.errors = [];
+
+    extension.errors.push(message);
+    log('Extension "%s" had error: %s'.format(uuid, message));
     state = state || ExtensionState.ERROR;
     _signals.emit('extension-state-changed', { uuid: uuid,
                                                error: message,
                                                state: state });
 }
 
-function loadExtension(dir, type, enabled) {
-    let info;
-    let uuid = dir.get_basename();
-
-    let metadataFile = dir.get_child('metadata.json');
-    if (!metadataFile.query_exists(null)) {
-        logExtensionError(uuid, 'Missing metadata.json');
-        return;
-    }
-
-    let metadataContents;
-    try {
-        metadataContents = Shell.get_file_contents_utf8_sync(metadataFile.get_path());
-    } catch (e) {
-        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) {
-        logExtensionError(uuid, 'extension already loaded');
-        return;
-    }
-
-    // Encourage people to add this
-    if (!meta['url']) {
-        global.log('Warning: Missing "url" property in metadata.json');
-    }
-
-    if (uuid != meta.uuid) {
-        logExtensionError(uuid, 'uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
-        return;
-    }
-
-    extensionMeta[uuid] = meta;
-    meta.type = type;
-    meta.dir = dir;
-    meta.path = dir.get_path();
-    meta.error = '';
-
+function loadExtension(extension) {
     // Default to error, we set success as the last step
-    meta.state = ExtensionState.ERROR;
+    extension.state = ExtensionState.ERROR;
 
-    if (!versionCheck(meta['shell-version'], Config.PACKAGE_VERSION) ||
-        (meta['js-version'] && !versionCheck(meta['js-version'], Config.GJS_VERSION))) {
-        logExtensionError(uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
-        meta.state = ExtensionState.OUT_OF_DATE;
+    if (ExtensionUtils.isOutOfDate(extension)) {
+        logExtensionError(extension.uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
+        extension.state = ExtensionState.OUT_OF_DATE;
         return;
     }
 
-    if (!enabled) {
-        meta.state = ExtensionState.INITIALIZED;
-        return;
+    let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
+    if (enabled) {
+        initExtension(extension.uuid);
+        if (extension.state == ExtensionState.DISABLED)
+            enableExtension(extension.uuid);
+    } else {
+        extension.state = ExtensionState.INITIALIZED;
     }
 
+    _signals.emit('extension-state-changed', extension);
+}
+
+function unloadExtension(uuid) {
+    let extension = ExtensionUtils.extensions[uuid];
+    if (!extension)
+        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);
+
+    extension.state = ExtensionState.UNINSTALLED;
+    _signals.emit('extension-state-changed', extension);
+
+    delete ExtensionUtils.extensions[uuid];
+    return true;
+}
+
+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)) {
         logExtensionError(uuid, '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;
+        ExtensionUtils.installImporter(extension);
+        extensionModule = extension.imports.extension;
     } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        logExtensionError(uuid, e);
+        logExtensionError(uuid, '' + e);
         return;
     }
 
-    if (!extensionModule.init) {
-        logExtensionError(uuid, 'missing \'init\' function');
-        return;
-    }
-
-    try {
-        extensionState = extensionModule.init(meta);
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        logExtensionError(uuid, 'Failed to evaluate init function:' + e);
-        return;
+    if (extensionModule.init) {
+        try {
+            extensionState = extensionModule.init(extension);
+        } catch (e) {
+            logExtensionError(uuid, 'Failed to evaluate init function:' + e);
+            return;
+        }
     }
 
     if (!extensionState)
         extensionState = extensionModule;
-    extensionStateObjs[uuid] = extensionState;
+    extension.stateObj = extensionState;
 
     if (!extensionState.enable) {
         logExtensionError(uuid, 'missing \'enable\' function');
@@ -424,13 +229,9 @@ function loadExtension(dir, type, enabled) {
         return;
     }
 
-    meta.state = ExtensionState.DISABLED;
+    extension.state = ExtensionState.DISABLED;
 
-    enableExtension(uuid);
-
-    _signals.emit('extension-loaded', meta.uuid);
-    _signals.emit('extension-state-changed', meta);
-    global.log('Loaded extension ' + meta.uuid);
+    _signals.emit('extension-loaded', uuid);
 }
 
 function onEnabledExtensionsChanged() {
@@ -455,116 +256,13 @@ function onEnabledExtensionsChanged() {
     enabledExtensions = newEnabledExtensions;
 }
 
-function init() {
-    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);
-    }
-
+function loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
     enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
+
+    let finder = new ExtensionUtils.ExtensionFinder();
+    finder.connect('extension-found', function(signals, extension) {
+        loadExtension(extension);
+    });
+    finder.scanExtensions();
 }
-
-function _loadExtensionsIn(dir, type) {
-    let fileEnum;
-    let file, info;
-    try {
-        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-    } catch (e) {
-        global.logError('' + e);
-       return;
-    }
-
-    while ((info = fileEnum.next_file(null)) != null) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            continue;
-        let name = info.get_name();
-        let child = dir.get_child(name);
-        let enabled = enabledExtensions.indexOf(name) != -1;
-        loadExtension(child, type, enabled);
-    }
-    fileEnum.close(null);
-}
-
-function loadExtensions() {
-    let systemDataDirs = GLib.get_system_data_dirs();
-    for (let i = 0; i < systemDataDirs.length; i++) {
-        let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
-        let dir = Gio.file_new_for_path(dirPath);
-        if (dir.query_exists(null))
-            _loadExtensionsIn(dir, ExtensionType.SYSTEM);
-    }
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
-}
-
-const InstallExtensionDialog = new Lang.Class({
-    Name: 'InstallExtensionDialog',
-    Extends: ModalDialog.ModalDialog,
-
-    _init: function(uuid, version_tag, name) {
-        this.parent({ 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/iconGrid.js

@@ -146,11 +146,6 @@ const BaseIcon = new Lang.Class({
             size = found ? len : ICON_SIZE;
         }
 
-        // don't create icons unnecessarily
-        if (size == this.iconSize &&
-            this._iconBin.child)
-            return;
-
         this._createIconTexture(size);
     }
 });
@@ -170,7 +165,7 @@ const IconGrid = new Lang.Class({
                                         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));
@@ -189,8 +184,8 @@ const IconGrid = new Lang.Class({
         // 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.natural_size = nColumns * this._item_size + totalSpacing;
+        alloc.min_size = this._hItemSize;
+        alloc.natural_size = nColumns * this._hItemSize + totalSpacing;
     },
 
     _getVisibleChildren: function() {
@@ -212,7 +207,7 @@ const IconGrid = new Lang.Class({
         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;
     },
@@ -245,13 +240,13 @@ const IconGrid = new Lang.Class({
                 = 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 {
@@ -275,10 +270,10 @@ const IconGrid = new Lang.Class({
             }
 
             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;
             }
         }
     },
@@ -287,12 +282,16 @@ const IconGrid = new Lang.Class({
         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._item_size + this._spacing;
+               (usedWidth + this._hItemSize <= forWidth)) {
+            usedWidth += this._hItemSize + this._spacing;
             nColumns += 1;
         }
 
@@ -305,25 +304,27 @@ const IconGrid = new Lang.Class({
     _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 () {
-        this._grid.get_children().forEach(Lang.bind(this, function (child) {
-            child.destroy();
-        }));
+    removeAll: function() {
+        this._grid.destroy_all_children();
     },
 
-    addItem: function(actor) {
-        this._grid.add_actor(actor);
+    addItem: function(actor, index) {
+        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

@@ -269,6 +269,11 @@ const Keyboard = new Lang.Class({
 
         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));
 
@@ -536,16 +541,8 @@ const KeyboardSource = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function(keyboard) {
-        this.parent(_("Keyboard"));
         this._keyboard = keyboard;
-
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: 'input-keyboard',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
+        this.parent(_("Keyboard"), 'input-keyboard', St.IconType.SYMBOLIC);
     },
 
     handleSummaryClick: function() {

js/ui/keyringPrompt.js

@@ -0,0 +1,207 @@
+// -*- 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)
+                       }]
+
+        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 });
+            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 });
+            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()
+    },
+});
+
+function init() {
+    prompter = new Gcr.SystemPrompter();
+    prompter.connect('new-prompt', function(prompter) {
+        let dialog = new KeyringDialog();
+        return dialog.prompt;
+    });
+
+    let connection = Gio.DBus.session;
+    prompter.register(connection);
+    Gio.bus_own_name_on_connection (connection, 'org.gnome.keyring.SystemPrompter',
+                                    Gio.BusNameOwnerFlags.REPLACE, null, null);
+}

js/ui/layout.js

@@ -8,6 +8,7 @@ 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;
@@ -21,7 +22,7 @@ const LayoutManager = new Lang.Class({
     Name: 'LayoutManager',
 
     _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;
@@ -52,6 +53,10 @@ const LayoutManager = new Lang.Class({
         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;
@@ -223,26 +228,9 @@ const LayoutManager = new Lang.Class({
         return false;
     },
 
-    get focusIndex() {
-        let focusWindow = global.display.focus_window;
-
-        if (focusWindow) {
-            let wrect = focusWindow.get_outer_rect();
-            for (let i = 0; i < this.monitors.length; i++) {
-                let monitor = this.monitors[i];
-
-                if (monitor.x <= wrect.x && monitor.y <= wrect.y &&
-                    monitor.x + monitor.width > wrect.x &&
-                    monitor.y + monitor.height > wrect.y)
-                    return i;
-            }
-        }
-
-        return this.primaryIndex;
-    },
-
-    get focusMonitor() {
-        return this.monitors[this.focusIndex];
+    get currentMonitor() {
+        let index = global.screen.get_current_monitor();
+        return Main.layoutManager.monitors[index];
     },
 
     _startupAnimation: function() {
@@ -404,7 +392,7 @@ const HotCorner = new Lang.Class({
 
         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 {
@@ -456,7 +444,7 @@ const HotCorner = new Lang.Class({
 
         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;
@@ -490,13 +478,15 @@ const HotCorner = new Lang.Class({
 
     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() {
@@ -849,6 +839,8 @@ const Chrome = new Lang.Class({
         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;
@@ -858,10 +850,15 @@ const Chrome = new Lang.Class({
                 break;
             }
         }
+
         if (changed) {
             this._updateVisibility();
             this._queueUpdateRegions();
         }
+
+        if (primaryWasInFullscreen != this._primaryMonitor.inFullscreen) {
+            this.emit('primary-fullscreen-changed', this._primaryMonitor.inFullscreen);
+        }
     },
 
     updateRegions: function() {
@@ -976,3 +973,5 @@ const Chrome = new Lang.Class({
         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;
@@ -57,11 +58,10 @@ const Lightbox = new Lang.Class({
         if (params.width && params.height) {
             this.actor.width = params.width;
             this.actor.height = params.height;
-            this._allocationChangedSignalId = 0;
         } else {
-            this.actor.width = container.width;
-            this.actor.height = container.height;
-            this._allocationChangedSignalId = container.connect('allocation-changed', Lang.bind(this, this._allocationChanged));
+            let constraint = new Clutter.BindConstraint({ source: container,
+                                                          coordinate: Clutter.BindCoordinate.ALL });
+            this.actor.add_constraint(constraint);
         }
 
         this._actorAddedSignalId = container.connect('actor-added', Lang.bind(this, this._actorAdded));
@@ -70,16 +70,6 @@ const Lightbox = new Lang.Class({
         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);
@@ -187,8 +177,6 @@ const Lightbox = new Lang.Class({
      * 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);
 

js/ui/lookingGlass.js

@@ -15,6 +15,7 @@ const Mainloop = imports.mainloop;
 
 const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
+const ExtensionUtils = imports.misc.extensionUtils;
 const Link = imports.ui.link;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
@@ -37,7 +38,7 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                     'const stage = global.stage; ' +
                     'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
                     /* Special lookingGlass functions */
-                       'const it = Main.lookingGlass.getIt(); ' +
+                    'const it = Main.lookingGlass.getIt(); ' +
                     'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';
 
 const HISTORY_KEY = 'looking-glass-history';
@@ -319,7 +320,7 @@ const WindowList = new Lang.Class({
     },
 
     _updateWindowList: function() {
-        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
+        this.actor.destroy_all_children();
         let windows = global.get_window_actors();
         let tracker = Shell.WindowTracker.get_default();
         for (let i = 0; i < windows.length; i++) {
@@ -377,7 +378,7 @@ const ObjInspector = new Lang.Class({
             this._previousObj = null;
         this._obj = obj;
 
-        this._container.get_children().forEach(function (child) { child.destroy(); });
+        this._container.destroy_all_children();
 
         let hbox = new St.BoxLayout({ style_class: 'lg-obj-inspector-title' });
         this._container.add_actor(hbox);
@@ -399,7 +400,14 @@ const ObjInspector = new Lang.Class({
         button.connect('clicked', Lang.bind(this, this.close));
         hbox.add(button);
         if (typeof(obj) == typeof({})) {
+            let properties = [];
             for (let propName in obj) {
+                properties.push(propName);
+            }
+            properties.sort();
+
+            for (let i = 0; i < properties.length; i++) {
+                let propName = properties[i];
                 let valueStr;
                 let link;
                 try {
@@ -626,45 +634,6 @@ const Inspector = new Lang.Class({
 
 Signals.addSignalMethods(Inspector.prototype);
 
-const ErrorLog = new Lang.Class({
-    Name: 'ErrorLog',
-
-    _init: function() {
-        this.actor = new St.BoxLayout();
-        this.text = new St.Label();
-        this.actor.add(this.text);
-        // We need to override StLabel's default ellipsization when
-        // using line_wrap; otherwise ClutterText's layout is going
-        // to constrain both the width and height, which prevents
-        // scrolling.
-        this.text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this.text.clutter_text.line_wrap = true;
-        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
-    },
-
-    _formatTime: function(d){
-        function pad(n) { return n < 10 ? '0' + n : n; }
-        return d.getUTCFullYear()+'-'
-            + pad(d.getUTCMonth()+1)+'-'
-            + pad(d.getUTCDate())+'T'
-            + pad(d.getUTCHours())+':'
-            + pad(d.getUTCMinutes())+':'
-            + pad(d.getUTCSeconds())+'Z';
-    },
-
-    _renderText: function() {
-        if (!this.actor.mapped)
-            return;
-        let text = this.text.text;
-        let stack = Main._getAndClearErrorStack();
-        for (let i = 0; i < stack.length; i++) {
-            let logItem = stack[i];
-            text += logItem.category + ' t=' + this._formatTime(new Date(logItem.timestamp)) + ' ' + logItem.message + '\n';
-        }
-        this.text.text = text;
-    }
-});
-
 const Memory = new Lang.Class({
     Name: 'Memory',
 
@@ -728,7 +697,7 @@ const Extensions = new Lang.Class({
         this._extensionsList.add(this._noExtensions);
         this.actor.add(this._extensionsList);
 
-        for (let uuid in ExtensionSystem.extensionMeta)
+        for (let uuid in ExtensionUtils.extensions)
             this._loadExtension(null, uuid);
 
         ExtensionSystem.connect('extension-loaded',
@@ -736,10 +705,10 @@ const Extensions = new Lang.Class({
     },
 
     _loadExtension: function(o, uuid) {
-        let extension = ExtensionSystem.extensionMeta[uuid];
+        let extension = ExtensionUtils.extensions[uuid];
         // There can be cases where we create dummy extension metadata
         // that's not really a proper extension. Don't bother with these.
-        if (!extension.name)
+        if (!extension.metadata.name)
             return;
 
         let extensionDisplay = this._createExtensionDisplay(extension);
@@ -751,32 +720,31 @@ const Extensions = new Lang.Class({
     },
 
     _onViewSource: function (actor) {
-        let meta = actor._extensionMeta;
-        let file = Gio.file_new_for_path(meta.path);
-        let uri = file.get_uri();
+        let extension = actor._extension;
+        let uri = extension.dir.get_uri();
         Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context());
         Main.lookingGlass.close();
     },
 
     _onWebPage: function (actor) {
-        let meta = actor._extensionMeta;
-        Gio.app_info_launch_default_for_uri(meta.url, global.create_app_launch_context());
+        let extension = actor._extension;
+        Gio.app_info_launch_default_for_uri(extension.metadata.url, global.create_app_launch_context());
         Main.lookingGlass.close();
     },
 
     _onViewErrors: function (actor) {
-        let meta = actor._extensionMeta;
+        let extension = actor._extension;
         let shouldShow = !actor._isShowing;
 
         if (shouldShow) {
-            let errors = ExtensionSystem.errors[meta.uuid];
+            let errors = extension.errors;
             let errorDisplay = new St.BoxLayout({ vertical: true });
             if (errors && errors.length) {
                 for (let i = 0; i < errors.length; i ++)
                     errorDisplay.add(new St.Label({ text: errors[i] }));
             } else {
                 /* Translators: argument is an extension UUID. */
-                let message = _("%s has not emitted any errors.").format(meta.uuid);
+                let message = _("%s has not emitted any errors.").format(extension.uuid);
                 errorDisplay.add(new St.Label({ text: message }));
             }
 
@@ -809,36 +777,36 @@ const Extensions = new Lang.Class({
         return 'Unknown'; // Not translated, shouldn't appear
     },
 
-    _createExtensionDisplay: function(meta) {
+    _createExtensionDisplay: function(extension) {
         let box = new St.BoxLayout({ style_class: 'lg-extension', vertical: true });
         let name = new St.Label({ style_class: 'lg-extension-name',
-                                   text: meta.name });
+                                   text: extension.metadata.name });
         box.add(name, { expand: true });
         let description = new St.Label({ style_class: 'lg-extension-description',
-                                         text: meta.description || 'No description' });
+                                         text: extension.metadata.description || 'No description' });
         box.add(description, { expand: true });
 
         let metaBox = new St.BoxLayout({ style_class: 'lg-extension-meta' });
         box.add(metaBox);
-        let stateString = this._stateToString(meta.state);
+        let stateString = this._stateToString(extension.state);
         let state = new St.Label({ style_class: 'lg-extension-state',
-                                   text: this._stateToString(meta.state) });
+                                   text: this._stateToString(extension.state) });
         metaBox.add(state);
 
         let viewsource = new Link.Link({ label: _("View Source") });
-        viewsource.actor._extensionMeta = meta;
+        viewsource.actor._extension = extension;
         viewsource.actor.connect('clicked', Lang.bind(this, this._onViewSource));
         metaBox.add(viewsource.actor);
 
-        if (meta.url) {
+        if (extension.metadata.url) {
             let webpage = new Link.Link({ label: _("Web Page") });
-            webpage.actor._extensionMeta = meta;
+            webpage.actor._extension = extension;
             webpage.actor.connect('clicked', Lang.bind(this, this._onWebPage));
             metaBox.add(webpage.actor);
         }
 
         let viewerrors = new Link.Link({ label: _("Show Errors") });
-        viewerrors.actor._extensionMeta = meta;
+        viewerrors.actor._extension = extension;
         viewerrors.actor._parentBox = box;
         viewerrors.actor._isShowing = false;
         viewerrors.actor.connect('clicked', Lang.bind(this, this._onViewErrors));
@@ -940,9 +908,6 @@ const LookingGlass = new Lang.Class({
         }));
         notebook.appendPage('Windows', this._windowList.actor);
 
-        this._errorLog = new ErrorLog();
-        notebook.appendPage('Errors', this._errorLog.actor);
-
         this._memory = new Memory();
         notebook.appendPage('Memory', this._memory.actor);
 
@@ -1038,7 +1003,7 @@ const LookingGlass = new Lang.Class({
             actor.add(padBin);
 
             this._completionActor = actor;
-            this._evalBox.insert_before(this._completionActor, this._entryArea);
+            this._evalBox.insert_child_below(this._completionActor, this._entryArea);
         }
 
         this._completionText.set_text(completions.join(', '));
@@ -1140,7 +1105,7 @@ const LookingGlass = new Lang.Class({
     // Handle key events which are relevant for all tabs of the LookingGlass
     _globalKeyPressEvent : function(actor, event) {
         let symbol = event.get_key_symbol();
-        let modifierState = Shell.get_event_state(event);
+        let modifierState = event.get_state();
         if (symbol == Clutter.Escape) {
             if (this._objInspector.actor.visible) {
                 this._objInspector.close();

js/ui/magnifier.js

@@ -16,6 +16,7 @@ const Params = imports.misc.params;
 
 const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];
+const NO_CHANGE = 0.0;
 
 // Settings
 const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
@@ -24,6 +25,13 @@ const SHOW_KEY                  = 'screen-magnifier-enabled';
 const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
+const INVERT_LIGHTNESS_KEY      = 'invert-lightness';
+const BRIGHT_RED_KEY            = 'brightness-red';
+const BRIGHT_GREEN_KEY          = 'brightness-green';
+const BRIGHT_BLUE_KEY           = 'brightness-blue';
+const CONTRAST_RED_KEY          = 'contrast-red';
+const CONTRAST_GREEN_KEY        = 'contrast-green';
+const CONTRAST_BLUE_KEY         = 'contrast-blue';
 const LENS_MODE_KEY             = 'lens-mode';
 const CLAMP_MODE_KEY            = 'scroll-at-edges';
 const MOUSE_TRACKING_KEY        = 'mouse-tracking';
@@ -443,6 +451,21 @@ const Magnifier = new Lang.Class({
             aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
             if (aPref)
                 zoomRegion.setMouseTrackingMode(aPref);
+
+            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+            if (aPref)
+                zoomRegion.setInvertLightness(aPref);
+
+            let bc = {};
+            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+            zoomRegion.setBrightness(bc);
+
+            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+            zoomRegion.setContrast(bc);
         }
 
         let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
@@ -465,6 +488,23 @@ const Magnifier = new Lang.Class({
         this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                                Lang.bind(this, this._updateMouseTrackingMode));
 
+        this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
+                               Lang.bind(this, this._updateInvertLightness));
+
+        this._settings.connect('changed::' + BRIGHT_RED_KEY,
+                               Lang.bind(this, this._updateBrightness));
+        this._settings.connect('changed::' + BRIGHT_GREEN_KEY,
+                               Lang.bind(this, this._updateBrightness));
+        this._settings.connect('changed::' + BRIGHT_BLUE_KEY,
+                               Lang.bind(this, this._updateBrightness));
+
+        this._settings.connect('changed::' + CONTRAST_RED_KEY,
+                               Lang.bind(this, this._updateContrast));
+        this._settings.connect('changed::' + CONTRAST_GREEN_KEY,
+                               Lang.bind(this, this._updateContrast));
+        this._settings.connect('changed::' + CONTRAST_BLUE_KEY,
+                               Lang.bind(this, this._updateContrast));
+
         this._settings.connect('changed::' + SHOW_CROSS_HAIRS_KEY,
                                Lang.bind(this, function() {
             this.setCrosshairsVisible(this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY));
@@ -540,7 +580,38 @@ const Magnifier = new Lang.Class({
                 this._settings.get_enum(MOUSE_TRACKING_KEY)
             );
         }
-    }
+    },
+
+    _updateInvertLightness: function() {
+        // Applies only to the first zoom region.
+        if (this._zoomRegions.length) {
+            this._zoomRegions[0].setInvertLightness(
+                this._settings.get_boolean(INVERT_LIGHTNESS_KEY)
+            );
+        }
+    },
+
+    _updateBrightness: function() {
+        // Applies only to the first zoom region.
+        if (this._zoomRegions.length) {
+            let brightness = {};
+            brightness.r = this._settings.get_double(BRIGHT_RED_KEY);
+            brightness.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+            brightness.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+            this._zoomRegions[0].setBrightness(brightness);
+        }
+    },
+
+    _updateContrast: function() {
+        // Applies only to the first zoom region.
+        if (this._zoomRegions.length) {
+            let contrast = {};
+            contrast.r = this._settings.get_double(CONTRAST_RED_KEY);
+            contrast.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+            contrast.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+            this._zoomRegions[0].setContrast(contrast);
+        }
+    },
 });
 Signals.addSignalMethods(Magnifier.prototype);
 
@@ -554,8 +625,12 @@ const ZoomRegion = new Lang.Class({
         this._clampScrollingAtEdges = false;
         this._lensMode = false;
         this._screenPosition = GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN;
+        this._invertLightness = false;
+        this._brightness = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };
+        this._contrast = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };
 
         this._magView = null;
+        this._background = null;
         this._uiGroupClone = null;
         this._mouseSourceActor = mouseSourceActor;
         this._mouseActor  = null;
@@ -565,12 +640,15 @@ const ZoomRegion = new Lang.Class({
         this._viewPortX = 0;
         this._viewPortY = 0;
         this._viewPortWidth = global.screen_width;
-        this._viewPortWidth = global.screen_height;
+        this._viewPortHeight = global.screen_height;
         this._xCenter = this._viewPortWidth / 2;
         this._yCenter = this._viewPortHeight / 2;
         this._xMagFactor = 1;
         this._yMagFactor = 1;
         this._followingCursor = false;
+
+        Main.layoutManager.connect('monitors-changed',
+                                   Lang.bind(this, this._monitorsChanged));
     },
 
     /**
@@ -875,6 +953,86 @@ const ZoomRegion = new Lang.Class({
         }
     },
 
+    /**
+     * setInvertLightness:
+     * Set whether to invert the lightness of the magnified view.
+     * @flag    Boolean to either invert brightness (true), or not (false).
+     */
+    setInvertLightness: function(flag) {
+        this._invertLightness = flag;
+        if (this._magShaderEffects)
+            this._magShaderEffects.setInvertLightness(this._invertLightness);
+    },
+
+    /**
+     * getInvertLightness:
+     * Retrieve whether the lightness is inverted.
+     * @return    Boolean indicating inversion (true), or not (false).
+     */
+    getInvertLightness: function() {
+        return this._invertLightness;
+    },
+
+    /**
+     * setBrightness:
+     * Alter the brightness of the magnified view.
+     * @brightness  Object containing the contrast for the red, green,
+     *              and blue channels.  Values of 0.0 represent "standard"
+     *              brightness (no change), whereas values less or greater than
+     *              0.0 indicate decreased or incresaed brightness, respectively.
+     */
+    setBrightness: function(brightness) {
+        this._brightness.r = brightness.r;
+        this._brightness.g = brightness.g;
+        this._brightness.b = brightness.b;
+        if (this._magShaderEffects)
+            this._magShaderEffects.setBrightness(this._brightness);
+    },
+
+    /**
+     * getBrightness:
+     * Retrive the current brightness of the Zoom Region.
+     * @return  Object containing the brightness change for the red, green,
+     *          and blue channels.
+     */
+    getBrightness: function() {
+        let brightness = {};
+        brightness.r = this._brightness.r;
+        brightness.g = this._brightness.g;
+        brightness.b = this._brightness.b;
+        return brightness;
+    },
+
+    /**
+     * setContrast:
+     * Alter the contrast of the magnified view.
+     * @contrast    Object containing the contrast for the red, green,
+     *              and blue channels.  Values of 0.0 represent "standard"
+     *              contrast (no change), whereas values less or greater than
+     *              0.0 indicate decreased or incresaed contrast, respectively.
+     */
+    setContrast: function(contrast) {
+        this._contrast.r = contrast.r;
+        this._contrast.g = contrast.g;
+        this._contrast.b = contrast.b;
+        if (this._magShaderEffects)
+            this._magShaderEffects.setContrast(this._contrast);
+    },
+
+    /**
+     * getContrast:
+     * Retreive the contrast of the magnified view.
+     * @return  Object containing the contrast for the red, green,
+     *          and blue channels.
+     */
+    getContrast: function() {
+        let contrast = {};
+        contrast.r = this._contrast.r;
+        contrast.g = this._contrast.g;
+        contrast.b = this._contrast.b;
+        return contrast;
+    },
+
     //// Private methods ////
 
     _createActors: function() {
@@ -891,15 +1049,15 @@ const ZoomRegion = new Lang.Class({
 
         // Add a background for when the magnified uiGroup is scrolled
         // out of view (don't want to see desktop showing through).
-        let background = new Clutter.Rectangle({ color: Main.DEFAULT_BACKGROUND_COLOR });
-        mainGroup.add_actor(background);
+        this._background = new Clutter.Rectangle({ color: Main.DEFAULT_BACKGROUND_COLOR });
+        mainGroup.add_actor(this._background);
 
         // Clone the group that contains all of UI on the screen.  This is the
         // chrome, the windows, etc.
         this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup });
         mainGroup.add_actor(this._uiGroupClone);
         Main.uiGroup.set_size(global.screen_width, global.screen_height);
-        background.set_size(global.screen_width, global.screen_height);
+        this._background.set_size(global.screen_width, global.screen_height);
 
         // Add either the given mouseSourceActor to the ZoomRegion, or a clone of
         // it.
@@ -913,6 +1071,12 @@ const ZoomRegion = new Lang.Class({
             this._crossHairsActor = this._crossHairs.addToZoomRegion(this, this._mouseActor);
         else
             this._crossHairsActor = null;
+
+        // Contrast and brightness effects.
+        this._magShaderEffects = new MagShaderEffects(this._uiGroupClone);
+        this._magShaderEffects.setInvertLightness(this._invertLightness);
+        this._magShaderEffects.setBrightness(this._brightness);
+        this._magShaderEffects.setContrast(this._contrast);
     },
 
     _destroyActors: function() {
@@ -921,8 +1085,11 @@ const ZoomRegion = new Lang.Class({
         if (this._crossHairs)
             this._crossHairs.removeFromParent(this._crossHairsActor);
 
+        this._magShaderEffects.destroyEffects();
+        this._magShaderEffects = null;
         this._magView.destroy();
         this._magView = null;
+        this._background = null;
         this._uiGroupClone = null;
         this._mouseActor = null;
         this._crossHairsActor = null;
@@ -1145,6 +1312,22 @@ const ZoomRegion = new Lang.Class({
             this._crossHairsActor.set_position(xMagMouse - groupWidth / 2,
                                                yMagMouse - groupHeight / 2);
         }
+    },
+
+    _monitorsChanged: function() {
+        if (!this.isActive())
+            return;
+
+        Main.uiGroup.set_size(global.screen_width, global.screen_height);
+        this._background.set_size(global.screen_width, global.screen_height);
+
+        if (this._screenPosition == GDesktopEnums.MagnifierScreenPosition.NONE)
+            this._setViewPort({ x: this._viewPortX,
+                                y: this._viewPortY,
+                                width: this._viewPortWidth,
+                                height: this._viewPortHeight });
+        else
+            this.setScreenPosition(this._screenPosition);
     }
 });
 
@@ -1175,6 +1358,14 @@ const Crosshairs = new Lang.Class({
         this._clipSize = [0, 0];
         this._clones = [];
         this.reCenter();
+
+        Main.layoutManager.connect('monitors-changed',
+                                   Lang.bind(this, this._monitorsChanged));
+    },
+
+    _monitorsChanged: function() {
+        this._actor.set_size(global.screen_width * 3, global.screen_height * 3);
+        this.reCenter();
     },
 
    /**
@@ -1199,10 +1390,7 @@ const Crosshairs = new Lang.Class({
                     crosshairsActor = new Clutter.Clone({ source: this._actor });
                     this._clones.push(crosshairsActor);
                 }
-                if (this._actor.visible)
-                    crosshairsActor.show();
-                else
-                    crosshairsActor.hide();
+                crosshairsActor.visible = this._actor.visible;
 
                 container.add_actor(crosshairsActor);
                 container.raise_child(magnifiedMouse, crosshairsActor);
@@ -1407,3 +1595,133 @@ const Crosshairs = new Lang.Class({
         this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
     }
 });
+
+const MagShaderEffects = new Lang.Class({
+    Name: 'MagShaderEffects',
+
+    _init: function(uiGroupClone) {
+        this._inverse = new Shell.InvertLightnessEffect();
+        this._brightnessContrast = new Clutter.BrightnessContrastEffect();
+        this._inverse.set_enabled(false);
+        this._brightnessContrast.set_enabled(false);
+
+        this._magView = uiGroupClone;
+        this._magView.add_effect(this._inverse);
+        this._magView.add_effect(this._brightnessContrast);
+    },
+
+    /**
+     * destroyEffects:
+     * Remove contrast and brightness effects from the magnified view, and
+     * lose the reference to the actor they were applied to.  Don't use this
+     * object after calling this.
+     */
+    destroyEffects: function() {
+        this._magView.clear_effects();
+        this._brightnessContrast = null;
+        this._inverse = null;
+        this._magView = null;
+    },
+
+    /**
+     * setInvertLightness:
+     * Enable/disable invert lightness effect.
+     * @invertFlag:     Enabled flag.
+     */
+    setInvertLightness: function(invertFlag) {
+        this._inverse.set_enabled(invertFlag);
+    },
+
+    /**
+     * getInvertLightness:
+     * Report whether the inversion effect is enabled.
+     * @return:     Boolean.
+     */
+    getInvertLightness: function() {
+        return this._inverse.get_enabled();
+    },
+
+    /**
+     * setBrightness:
+     * Set the brightness of the magnified view.
+     * @brightness: Object containing the brightness for the red, green,
+     *              and blue channels.  Values of 0.0 represent "standard"
+     *              brightness (no change), whereas values less or greater than
+     *              0.0 indicate decreased or incresaed brightness,
+     *              respectively.
+     */
+    setBrightness: function(brightness) {
+        let bRed = brightness.r;
+        let bGreen = brightness.g;
+        let bBlue = brightness.b;
+        this._brightnessContrast.set_brightness_full(bRed, bGreen, bBlue);
+
+        // Enable the effect if the brightness OR contrast change are such that
+        // it modifies the brightness and/or contrast.
+        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
+        this._brightnessContrast.set_enabled(
+            (bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE ||
+             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE)
+        );
+    },
+
+    /**
+     * getBrightness:
+     * Retrieve current brightness of the magnified view.
+     * @return: Object containing the brightness for the red, green,
+     *          and blue channels.  Values of 0.0 represent "standard" 
+     *          brightness (no change), whereas values less or greater than
+     *          0.0 indicate decreased or incresaed brightness, respectively.
+     */
+    getBrightness: function() {
+        let result = {};
+        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
+        result.r = bRed;
+        result.g = bGreen;
+        result.b = bBlue;
+
+        return result;
+    },
+
+    /**
+     * Set the contrast of the magnified view.
+     * @contrast:   Object containing the contrast for the red, green,
+     *              and blue channels.  Values of 0.0 represent "standard"
+     *              contrast (no change), whereas values less or greater than
+     *              0.0 indicate decreased or incresaed contrast, respectively.
+     */
+    setContrast: function(contrast) {
+        let cRed = contrast.r;
+        let cGreen = contrast.g;
+        let cBlue = contrast.b;
+
+        this._brightnessContrast.set_contrast_full(cRed, cGreen, cBlue);
+
+        // Enable the effect if the contrast OR brightness change are such that
+        // it modifies the brightness and/or contrast.
+        // should be able to use Clutter.color_equal(), but that complains of
+        // a null first argument.
+        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
+        this._brightnessContrast.set_enabled(
+             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE ||
+             bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE
+        );
+    },
+
+    /**
+     * Retrieve current contrast of the magnified view.
+     * @return: Object containing the contrast for the red, green,
+     *          and blue channels.  Values of 0.0 represent "standard"
+     *          contrast (no change), whereas values less or greater than
+     *          0.0 indicate decreased or incresaed contrast, respectively.
+     */
+    getContrast: function() {
+        let resutl = {};
+        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
+        result.r = cRed;
+        result.g = cGreen;
+        result.b = cBlue;
+
+        return result;
+    }
+});

js/ui/main.js

@@ -15,8 +15,10 @@ const AutorunManager = imports.ui.autorunManager;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
 const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
+const KeyringPrompt = imports.ui.keyringPrompt;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
+const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
@@ -29,7 +31,9 @@ const NetworkAgent = imports.ui.networkAgent;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const Scripting = imports.ui.scripting;
+const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
+const ShellMountOperation = imports.ui.shellMountOperation;
 const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
@@ -37,6 +41,7 @@ const XdndHandler = imports.ui.xdndHandler;
 const StatusIconDispatcher = imports.ui.statusIconDispatcher;
 const Util = imports.misc.util;
 
+const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
 const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
 DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
 
@@ -44,7 +49,6 @@ let automountManager = null;
 let autorunManager = null;
 let panel = null;
 let hotCorners = [];
-let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
@@ -55,7 +59,9 @@ let windowAttentionHandler = null;
 let telepathyClient = null;
 let ctrlAltTabManager = null;
 let recorder = null;
+let sessionMode = null;
 let shellDBusService = null;
+let shellMountOpDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
 let uiGroup = null;
@@ -65,27 +71,27 @@ let statusIconDispatcher = null;
 let keyboard = null;
 let layoutManager = null;
 let networkAgent = null;
-let _errorLogStack = [];
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
-let _gdmCssStylesheet = null;
+let _overridesSettings = null;
 
 let background = null;
 
-function _createUserSession() {
+function createUserSession() {
     // Load the calendar server. Note that we are careful about
     // not loading any events until the user presses the clock
     global.launch_calendar_server();
 
-    placesManager = new PlaceDisplay.PlacesManager();
     telepathyClient = new TelepathyClient.Client();
     automountManager = new AutomountManager.AutomountManager();
     autorunManager = new AutorunManager.AutorunManager();
     networkAgent = new NetworkAgent.NetworkAgent();
+
+    _initRecorder();
 }
 
-function _createGDMSession() {
+function createGDMSession() {
     // We do this this here instead of at the top to prevent GDM
     // related code from getting loaded in normal user sessions
     const LoginDialog = imports.gdm.loginDialog;
@@ -96,21 +102,31 @@ function _createGDMSession() {
                         });
 }
 
+function createInitialSetupSession() {
+    networkAgent = new NetworkAgent.NetworkAgent();
+}
+
 function _initRecorder() {
     let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
+    let desktopLockdownSettings = new Gio.Settings({ schema: 'org.gnome.desktop.lockdown' });
+    let bindingSettings = new Gio.Settings({ schema: 'org.gnome.shell.keybindings' });
 
-    global.screen.connect('toggle-recording', function() {
+    global.display.add_keybinding('toggle-recording',
+                                  bindingSettings,
+                                  Meta.KeyBindingFlags.NONE, function() {
         if (recorder == null) {
             recorder = new Shell.Recorder({ stage: global.stage });
         }
 
         if (recorder.is_recording()) {
-            recorder.pause();
+            recorder.close();
             Meta.enable_unredirect_for_screen(global.screen);
-        } else {
+        } else if (!desktopLockdownSettings.get_boolean('disable-save-to-disk')) {
             // read the parameters from GSettings always in case they have changed
             recorder.set_framerate(recorderSettings.get_int('framerate'));
-            recorder.set_filename('shell-%d%u-%c.' + recorderSettings.get_string('file-extension'));
+            /* Translators: this is a filename used for screencast recording */
+            // xgettext:no-c-format
+            recorder.set_filename(_("Screencast from %d %t") + '.' + recorderSettings.get_string('file-extension'));
             let pipeline = recorderSettings.get_string('pipeline');
 
             if (!pipeline.match(/^\s*$/))
@@ -124,39 +140,19 @@ function _initRecorder() {
     });
 }
 
-function _initUserSession() {
-    _initRecorder();
-
-    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
-
-    ExtensionSystem.init();
-    ExtensionSystem.loadExtensions();
-
-    Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
-       getRunDialog().open();
-    });
-
-    Meta.keybindings_set_custom_handler('panel-main-menu', function () {
-        overview.toggle();
-    });
-
-    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
-
-}
-
 function start() {
-    // Monkey patch utility functions into the global proxy;
-    // This is easier and faster than indirecting down into global
-    // if we want to call back up into JS.
-    global.logError = _logError;
-    global.log = _logDebug;
+    // These are here so we don't break compatibility.
+    global.logError = window.log;
+    global.log = window.log;
 
     // Chain up async errors reported from C
     global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });
 
     Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
+    sessionMode = new SessionMode.SessionMode();
     shellDBusService = new ShellDBus.GnomeShell();
+    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
 
     // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
     // also initialize ShellAppSystem first.  ShellAppSystem
@@ -166,9 +162,11 @@ function start() {
     // and recalculate application associations, so to avoid
     // races for now we initialize it here.  It's better to
     // be predictable anyways.
-    Shell.WindowTracker.get_default();
+    let tracker = Shell.WindowTracker.get_default();
     Shell.AppUsage.get_default();
 
+    tracker.connect('startup-sequence-changed', _queueCheckWorkspaces);
+
     // The stage is always covered so Clutter doesn't need to clear it; however
     // the color is used as the default contents for the Mutter root background
     // actor so set it anyways.
@@ -176,7 +174,6 @@ function start() {
     global.stage.no_clear_hint = true;
 
     _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
-    _gdmCssStylesheet = global.datadir + '/theme/gdm.css';
     loadTheme();
 
     // Set up stage hierarchy to group all UI actors under one container.
@@ -187,7 +184,16 @@ function start() {
                         for (let i = 0; i < children.length; i++)
                             children[i].allocate_preferred_size(flags);
                     });
-    St.set_ui_root(global.stage, uiGroup);
+    uiGroup.connect('get-preferred-width',
+                    function(actor, forHeight, alloc) {
+                        let width = global.stage.width;
+                        [alloc.min_size, alloc.natural_size] = [width, width];
+                    });
+    uiGroup.connect('get-preferred-height',
+                    function(actor, forWidth, alloc) {
+                        let height = global.stage.height;
+                        [alloc.min_size, alloc.natural_size] = [height, height];
+                    });
     global.window_group.reparent(uiGroup);
     global.overlay_group.reparent(uiGroup);
     global.stage.add_actor(uiGroup);
@@ -195,8 +201,7 @@ function start() {
     layoutManager = new Layout.LayoutManager();
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    // This overview object is just a stub for non-user sessions
-    overview = new Overview.Overview({ isDummy: global.session_type != Shell.SessionType.USER });
+    overview = new Overview.Overview();
     magnifier = new Magnifier.Magnifier();
     statusIconDispatcher = new StatusIconDispatcher.StatusIconDispatcher();
     panel = new Panel.Panel();
@@ -206,10 +211,7 @@ function start() {
     notificationDaemon = new NotificationDaemon.NotificationDaemon();
     windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
 
-    if (global.session_type == Shell.SessionType.USER)
-        _createUserSession();
-    else if (global.session_type == Shell.SessionType.GDM)
-        _createGDMSession();
+    sessionMode.createSession();
 
     panel.startStatusArea();
 
@@ -217,8 +219,30 @@ function start() {
     keyboard.init();
     overview.init();
 
-    if (global.session_type == Shell.SessionType.USER)
-        _initUserSession();
+    if (sessionMode.hasWorkspaces)
+        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                                false, -1, 1);
+
+    if (sessionMode.allowExtensions) {
+        ExtensionDownloader.init();
+        ExtensionSystem.loadExtensions();
+    }
+
+    if (sessionMode.hasRunDialog) {
+        Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
+           getRunDialog().open();
+        });
+    }
+
+    if (sessionMode.hasOverview) {
+        Meta.keybindings_set_custom_handler('panel-main-menu', function () {
+            overview.toggle();
+        });
+
+        global.display.connect('overlay-key',
+                               Lang.bind(overview, overview.toggle));
+    }
+
     statusIconDispatcher.start(messageTray.actor);
 
     // Provide the bus object for gnome-session to
@@ -228,11 +252,13 @@ function start() {
     // Attempt to become a PolicyKit authentication agent
     PolkitAuthenticationAgent.init()
 
+    // Become a prompter for gnome keyring
+    KeyringPrompt.init();
+
     _startDate = new Date();
 
     global.stage.connect('captured-event', _globalKeyPressHandler);
 
-    _log('info', 'loaded at ' + _startDate);
     log('GNOME Shell started at ' + _startDate);
 
     let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@@ -242,6 +268,9 @@ function start() {
         Scripting.runPerfScript(module, perfOutput);
     }
 
+    _overridesSettings = new Gio.Settings({ schema: OVERRIDES_SCHEMA });
+    _overridesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
+
     global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
 
     global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
@@ -266,17 +295,30 @@ function _checkWorkspaces() {
     let i;
     let emptyWorkspaces = [];
 
+    if (!Meta.prefs_get_dynamic_workspaces()) {
+        _checkWorkspacesId = 0;
+        return false;
+    }
+
     for (i = 0; i < _workspaces.length; i++) {
         let lastRemoved = _workspaces[i]._lastRemovedWindow;
-        if (lastRemoved &&
-            (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-             lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-             lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG))
+        if ((lastRemoved &&
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+            _workspaces[i]._keepAliveId)
                 emptyWorkspaces[i] = false;
         else
             emptyWorkspaces[i] = true;
     }
 
+    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+    for (i = 0; i < sequences.length; i++) {
+        let index = sequences[i].get_workspace();
+        if (index >= 0 && index <= global.screen.n_workspaces)
+            emptyWorkspaces[index] = false;
+    }
+
     let windows = global.get_window_actors();
     for (i = 0; i < windows.length; i++) {
         let win = windows[i];
@@ -324,6 +366,17 @@ function _checkWorkspaces() {
     return false;
 }
 
+function keepWorkspaceAlive(workspace, duration) {
+    if (workspace._keepAliveId)
+        Mainloop.source_remove(workspace._keepAliveId);
+
+    workspace._keepAliveId = Mainloop.timeout_add(duration, function() {
+        workspace._keepAliveId = 0;
+        _queueCheckWorkspaces();
+        return false;
+    });
+}
+
 function _windowRemoved(workspace, window) {
     workspace._lastRemovedWindow = window;
     _queueCheckWorkspaces();
@@ -332,6 +385,7 @@ function _windowRemoved(workspace, window) {
             workspace._lastRemovedWindow = null;
             _queueCheckWorkspaces();
         }
+        return false;
     });
 }
 
@@ -447,8 +501,8 @@ function loadTheme() {
 
     let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
 
-    if (global.session_type == Shell.SessionType.GDM)
-        theme.load_stylesheet(_gdmCssStylesheet);
+    if (sessionMode.extraStylesheet)
+        theme.load_stylesheet(sessionMode.extraStylesheet);
 
     if (previousTheme) {
         let customStylesheets = previousTheme.get_custom_stylesheets();
@@ -490,59 +544,6 @@ function notifyError(msg, details) {
     notify(msg, details);
 }
 
-/**
- * _log:
- * @category: string message type ('info', 'error')
- * @msg: A message string
- * ...: Any further arguments are converted into JSON notation,
- *      and appended to the log message, separated by spaces.
- *
- * Log a message into the LookingGlass error
- * stream.  This is primarily intended for use by the
- * extension system as well as debugging.
- */
-function _log(category, msg) {
-    let text = msg;
-    if (arguments.length > 2) {
-        text += ': ';
-        for (let i = 2; i < arguments.length; i++) {
-            text += JSON.stringify(arguments[i]);
-            if (i < arguments.length - 1)
-                text += ' ';
-        }
-    }
-    _errorLogStack.push({timestamp: new Date().getTime(),
-                         category: category,
-                         message: text });
-}
-
-function _logError(msg) {
-    return _log('error', msg);
-}
-
-function _logDebug(msg) {
-    return _log('debug', msg);
-}
-
-// Used by the error display in lookingGlass.js
-function _getAndClearErrorStack() {
-    let errors = _errorLogStack;
-    _errorLogStack = [];
-    return errors;
-}
-
-function logStackTrace(msg) {
-    try {
-        throw new Error();
-    } catch (e) {
-        // e.stack must have at least two lines, with the first being
-        // logStackTrace() (which we strip off), and the second being
-        // our caller.
-        let trace = e.stack.substr(e.stack.indexOf('\n') + 1);
-        log(msg ? (msg + '\n' + trace) : trace);
-    }
-}
-
 function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
     return win.get_workspace() == workspaceIndex ||
         (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
@@ -565,18 +566,19 @@ function _globalKeyPressHandler(actor, event) {
     if (event.type() != Clutter.EventType.KEY_PRESS)
         return false;
 
+    if (!sessionMode.allowKeybindingsWhenModal) {
+        if (modalCount > (overview.visible ? 1 : 0))
+            return false;
+    }
+
     let symbol = event.get_key_symbol();
     let keyCode = event.get_key_code();
-    let modifierState = Shell.get_event_state(event);
+    let ignoredModifiers = global.display.get_ignored_modifier_mask();
+    let modifierState = event.get_state() & ~ignoredModifiers;
 
     // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
     let action = global.display.get_keybinding_action(keyCode, modifierState);
 
-    // Other bindings are only available to the user session when the overview is up and
-    // no modal dialog is present.
-    if (global.session_type == Shell.SessionType.USER && (!overview.visible || modalCount > 1))
-        return false;
-
     // This isn't a Meta.KeyBindingAction yet
     if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
         overview.hide();
@@ -589,28 +591,39 @@ function _globalKeyPressHandler(actor, event) {
         return true;
     }
 
-    // None of the other bindings are relevant outside of the user's session
-    if (global.session_type != Shell.SessionType.USER)
-        return false;
-
     switch (action) {
         // left/right would effectively act as synonyms for up/down if we enabled them;
         // but that could be considered confusing; we also disable them in the main view.
         //
         // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
         //     wm.actionMoveWorkspaceLeft();
         //     return true;
         // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
         //     wm.actionMoveWorkspaceRight();
         //     return true;
         case Meta.KeyBindingAction.WORKSPACE_UP:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
             wm.actionMoveWorkspaceUp();
             return true;
         case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
             wm.actionMoveWorkspaceDown();
             return true;
         case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
         case Meta.KeyBindingAction.COMMAND_2:
+            if (!sessionMode.hasRunDialog)
+                return false;
+
             getRunDialog().open();
             return true;
         case Meta.KeyBindingAction.PANEL_MAIN_MENU:
@@ -661,6 +674,7 @@ function pushModal(actor, timestamp, options) {
             log('pushModal: invocation of begin_modal failed');
             return false;
         }
+        Meta.disable_unredirect_for_screen(global.screen);
     }
 
     global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
@@ -741,6 +755,7 @@ function popModal(actor, timestamp) {
 
     global.end_modal(timestamp);
     global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+    Meta.enable_unredirect_for_screen(global.screen);
 }
 
 function createLookingGlass() {
@@ -883,7 +898,8 @@ function initializeDeferredWork(actor, callback, props) {
 function queueDeferredWork(workId) {
     let data = _deferredWorkData[workId];
     if (!data) {
-        global.logError('invalid work id ', workId);
+        let message = 'Invalid work id %d'.format(workId);
+        logError(new Error(message), message);
         return;
     }
     if (_deferredWorkQueue.indexOf(workId) < 0)

js/ui/messageTray.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
+const Atk = imports.gi.Atk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -261,7 +262,9 @@ const FocusGrabber = new Lang.Class({
 
         this._hasFocus = true;
 
-        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        if (!this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
+            this.actor.grab_key_focus();
+
         this.emit('focus-grabbed');
     },
 
@@ -423,7 +426,7 @@ const Notification = new Lang.Class({
         this._bannerBodyText = null;
         this._bannerBodyMarkup = false;
         this._titleFitsInBannerMode = true;
-        this._titleDirection = St.TextDirection.NONE;
+        this._titleDirection = Clutter.TextDirection.DEFAULT;
         this._spacing = 0;
         this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
         this._imageBin = null;
@@ -433,12 +436,12 @@ const Notification = new Lang.Class({
                 this.destroy(reason);
             }));
 
-        this.actor = new St.Button();
+        this.actor = new St.Button({ accessible_role: Atk.Role.NOTIFICATION });
         this.actor._delegate = this;
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
-        this._table = new St.Table({ name: 'notification',
+        this._table = new St.Table({ style_class: 'notification',
                                      reactive: true });
         this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
         this.actor.set_child(this._table);
@@ -544,9 +547,9 @@ const Notification = new Lang.Class({
         this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
 
         if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
-            this._titleDirection = St.TextDirection.RTL;
+            this._titleDirection = Clutter.TextDirection.RTL;
         else
-            this._titleDirection = St.TextDirection.LTR;
+            this._titleDirection = Clutter.TextDirection.LTR;
 
         // Let the title's text direction control the overall direction
         // of the notification - in case where different scripts are used
@@ -554,7 +557,7 @@ const Notification = new Lang.Class({
         // arguably for action buttons as well. Labels other than the title
         // will be allocated at the available width, so that their alignment
         // is done correctly automatically.
-        this._table.set_direction(this._titleDirection);
+        this._table.set_text_direction(this._titleDirection);
 
         // Unless the notification has custom content, we save this._bannerBodyText
         // to add it to the content of the notification if the notification is
@@ -574,7 +577,7 @@ const Notification = new Lang.Class({
 
         if (params.body)
             this.addBody(params.body, params.bodyMarkup);
-        this._updated();
+        this.updated();
     },
 
     setIconVisible: function(visible) {
@@ -583,19 +586,21 @@ const Notification = new Lang.Class({
 
     enableScrolling: function(enableScrolling) {
         this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea)
+        if (this._scrollArea) {
             this._scrollArea.vscrollbar_policy = this._scrollPolicy;
+            this._scrollArea.enable_mouse_scrolling = enableScrolling;
+        }
     },
 
     _createScrollArea: function() {
         this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
+        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
                                                vscrollbar_policy: this._scrollPolicy,
                                                hscrollbar_policy: Gtk.PolicyType.NEVER });
         this._table.add(this._scrollArea, { row: 1,
                                             col: 2 });
         this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ name: 'notification-body',
+        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
                                                vertical: true });
         this._scrollArea.add_actor(this._contentArea);
         // If we know the notification will be expandable, we need to add
@@ -613,7 +618,7 @@ const Notification = new Lang.Class({
         }
 
         this._contentArea.add(actor, style ? style : {});
-        this._updated();
+        this.updated();
     },
 
     // addBody:
@@ -676,7 +681,7 @@ const Notification = new Lang.Class({
         this._table.add_style_class_name('multi-line-notification');
         this._table.add(this._actionArea, props);
         this._updateLastColumnSettings();
-        this._updated();
+        this.updated();
     },
 
     _updateLastColumnSettings: function() {
@@ -731,7 +736,7 @@ const Notification = new Lang.Class({
     addButton: function(id, label) {
         if (!this._buttonBox) {
 
-            let box = new St.BoxLayout({ name: 'notification-actions' });
+            let box = new St.BoxLayout({ style_class: 'notification-actions' });
             this.setActionArea(box, { x_expand: false,
                                       y_expand: false,
                                       x_fill: false,
@@ -741,6 +746,7 @@ const Notification = new Lang.Class({
         }
 
         let button = new St.Button({ can_focus: true });
+        button._actionId = id;
 
         if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
             button.add_style_class_name('notification-icon-button');
@@ -750,14 +756,39 @@ const Notification = new Lang.Class({
             button.label = label;
         }
 
-        if (this._buttonBox.get_children().length > 0)
+        if (this._buttonBox.get_n_children() > 0)
             this._buttonFocusManager.remove_group(this._buttonBox);
 
         this._buttonBox.add(button);
         this._buttonFocusManager.add_group(this._buttonBox);
         button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
 
-        this._updated();
+        this.updated();
+    },
+
+    // setButtonSensitive:
+    // @id: the action ID
+    // @sensitive: whether the button should be sensitive
+    //
+    // If the notification contains a button with action ID @id,
+    // its sensitivity will be set to @sensitive. Insensitive
+    // buttons cannot be clicked.
+    setButtonSensitive: function(id, sensitive) {
+        if (!this._buttonBox)
+            return;
+
+        let button = this._buttonBox.get_children().filter(function(b) {
+            return b._actionId == id;
+        })[0];
+
+        if (!button || button.reactive == sensitive)
+            return;
+
+        button.reactive = sensitive;
+        if (sensitive)
+            button.remove_style_pseudo_class('insensitive');
+        else
+            button.add_style_pseudo_class('insensitive');
     },
 
     setUrgency: function(urgency) {
@@ -802,7 +833,7 @@ const Notification = new Lang.Class({
 
         let titleBox = new Clutter.ActorBox();
         let titleBoxW = Math.min(titleNatW, availWidth);
-        if (this._titleDirection == St.TextDirection.RTL) {
+        if (this._titleDirection == Clutter.TextDirection.RTL) {
             titleBox.x1 = availWidth - titleBoxW;
             titleBox.x2 = availWidth;
         } else {
@@ -821,7 +852,7 @@ const Notification = new Lang.Class({
         } else {
             let bannerBox = new Clutter.ActorBox();
 
-            if (this._titleDirection == St.TextDirection.RTL) {
+            if (this._titleDirection == Clutter.TextDirection.RTL) {
                 bannerBox.x1 = 0;
                 bannerBox.x2 = titleBox.x1 - this._spacing;
 
@@ -853,7 +884,7 @@ const Notification = new Lang.Class({
                                         if (this._canExpandContent()) {
                                             this._addBannerBody();
                                             this._table.add_style_class_name('multi-line-notification');
-                                            this._updated();
+                                            this.updated();
                                         }
                                         return false;
                                      }));
@@ -864,7 +895,7 @@ const Notification = new Lang.Class({
                (!this._titleFitsInBannerMode && !this._table.has_style_class_name('multi-line-notification'));
     },
 
-    _updated: function() {
+    updated: function() {
         if (this.expanded)
             this.expand(false);
     },
@@ -955,8 +986,10 @@ const Source = new Lang.Class({
 
     ICON_SIZE: 24,
 
-    _init: function(title) {
+    _init: function(title, iconName, iconType) {
         this.title = title;
+        this.iconName = iconName;
+        this.iconType = iconType;
 
         this.actor = new Shell.GenericContainer();
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@@ -986,6 +1019,8 @@ const Source = new Lang.Class({
         this.isMuted = false;
 
         this.notifications = [];
+
+        this._setSummaryIcon(this.createNotificationIcon());
     },
 
     _getPreferredWidth: function (actor, forHeight, alloc) {
@@ -1005,9 +1040,9 @@ const Source = new Lang.Class({
         let childBox = new Clutter.ActorBox();
 
         let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
-        let direction = this.actor.get_direction();
+        let direction = this.actor.get_text_direction();
 
-        if (direction == St.TextDirection.LTR) {
+        if (direction == Clutter.TextDirection.LTR) {
             // allocate on the right in LTR
             childBox.x1 = box.x2 - naturalWidth;
             childBox.x2 = box.x2;
@@ -1056,10 +1091,12 @@ const Source = new Lang.Class({
     },
 
     // Called to create a new icon actor (of size this.ICON_SIZE).
-    // Must be overridden by the subclass if you do not pass icons
-    // explicitly to the Notification() constructor.
+    // Provides a sane default implementation, override if you need
+    // something more fancy.
     createNotificationIcon: function() {
-        throw new Error('no implementation of createNotificationIcon in ' + this);
+        return new St.Icon({ icon_name: this.iconName,
+                             icon_type: this.iconType,
+                             icon_size: this.ICON_SIZE });
     },
 
     // Unlike createNotificationIcon, this always returns the same actor;
@@ -1110,16 +1147,14 @@ const Source = new Lang.Class({
     },
 
     //// Protected methods ////
-
-    // The subclass must call this at least once to set the summary icon.
     _setSummaryIcon: function(icon) {
         if (this._iconBin.child)
             this._iconBin.child.destroy();
         this._iconBin.child = icon;
     },
 
-    // Default implementation is to do nothing, but subclasses can override
     open: function(notification) {
+        this.emit('opened', notification);
     },
 
     destroyNonResidentNotifications: function() {
@@ -1249,7 +1284,7 @@ const SummaryItem = new Lang.Class({
     },
 
     prepareNotificationStackForShowing: function() {
-        if (this.notificationStack.get_children().length > 0)
+        if (this.notificationStack.get_n_children() > 0)
             return;
 
         for (let i = 0; i < this.source.notifications.length; i++) {
@@ -1258,7 +1293,6 @@ const SummaryItem = new Lang.Class({
     },
 
     doneShowingNotificationStack: function() {
-        let notificationActors = this.notificationStack.get_children();
         for (let i = 0; i < this._stackedNotifications.length; i++) {
             let stackedNotification = this._stackedNotifications[i];
             let notification = stackedNotification.notification;
@@ -1288,7 +1322,7 @@ const SummaryItem = new Lang.Class({
         this._stackedNotifications.push(stackedNotification);
         if (!this.source.isChat)
             notification.enableScrolling(false);
-        if (this.notificationStack.get_children().length > 0)
+        if (this.notificationStack.get_n_children() > 0)
             notification.setIconVisible(false);
         this.notificationStack.add(notification.actor);
         notification.expand(false);
@@ -1327,8 +1361,9 @@ const SummaryItem = new Lang.Class({
             }
         }
 
-        if (this.notificationStack.get_children().length > 0)
-            this.notificationStack.get_children()[0]._delegate.setIconVisible(true);
+        let firstNotification = this._stackedNotifications[0];
+        if (firstNotification)
+            firstNotification.notification.setIconVisible(true);
     }
 });
 Signals.addSignalMethods(SummaryItem.prototype);
@@ -1340,16 +1375,14 @@ const MessageTray = new Lang.Class({
         this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
             this._onStatusChanged(proxy.status);
         }));
-        this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
         this._busy = false;
-        this._backFromAway = false;
         this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
             this._onStatusChanged(status);
         }));
 
-        this.actor = new St.Group({ name: 'message-tray',
-                                    reactive: true,
-                                    track_hover: true });
+        this.actor = new St.Widget({ name: 'message-tray',
+                                     reactive: true,
+                                     track_hover: true });
         this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
 
         this._notificationBin = new St.Bin();
@@ -1388,6 +1421,12 @@ const MessageTray = new Lang.Class({
         this._summaryItemTitleWidth = 0;
         this._pointerBarrier = 0;
 
+        this._unseenNotifications = [];
+        this._idleMonitorWatchId = 0;
+        this._backFromAway = false;
+
+        this.idleMonitor = new Shell.IdleMonitor();
+
         // To simplify the summary item animation code, we pretend
         // that there's an invisible SummaryItem to the left of the
         // leftmost real summary item, and that it's expanded when all
@@ -1429,6 +1468,7 @@ const MessageTray = new Lang.Class({
         this._overviewVisible = Main.overview.visible;
         this._notificationRemoved = false;
         this._reNotifyAfterHideNotification = null;
+        this._inFullscreen = false;
 
         this._corner = new Clutter.Rectangle({ width: 1,
                                                height: 1,
@@ -1444,6 +1484,7 @@ const MessageTray = new Lang.Class({
         Main.layoutManager.trackChrome(this._notificationBin);
 
         Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._setSizePosition));
+        Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
 
         this._setSizePosition();
 
@@ -1490,7 +1531,7 @@ const MessageTray = new Lang.Class({
         this._summaryBin.x = 0;
         this._summaryBin.width = monitor.width;
 
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             this._corner.x = 0;
         else
             this._corner.x = Main.layoutManager.trayBox.width - 1;
@@ -1519,10 +1560,10 @@ const MessageTray = new Lang.Class({
         let summaryItem = new SummaryItem(source);
 
         if (source.isChat) {
-            this._summary.insert_actor(summaryItem.actor, 0);
+            this._summary.insert_child_at_index(summaryItem.actor, 0);
             this._chatSummaryItemsCount++;
         } else {
-            this._summary.insert_actor(summaryItem.actor, this._chatSummaryItemsCount);
+            this._summary.insert_child_at_index(summaryItem.actor, this._chatSummaryItemsCount);
         }
 
         let titleWidth = summaryItem.getTitleNaturalWidth();
@@ -1631,6 +1672,10 @@ const MessageTray = new Lang.Class({
     },
 
     _onNotificationDestroy: function(notification) {
+        let unseenNotificationsIndex = this._unseenNotifications.indexOf(notification);
+        if (unseenNotificationsIndex != -1)
+            this._unseenNotifications.splice(unseenNotificationsIndex, 1);
+
         if (this._notification == notification && (this._notificationState == State.SHOWN || this._notificationState == State.SHOWING)) {
             this._updateNotificationTimeout(0);
             this._notificationRemoved = true;
@@ -1913,17 +1958,16 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
-    _onStatusChanged: function(status) {
-        this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
-        this._userStatus = status;
+    _onFullscreenChanged: function(obj, state) {
+        this._inFullscreen = state;
+        this._updateState();
+    },
 
+    _onStatusChanged: function(status) {
         if (status == GnomeSession.PresenceStatus.BUSY) {
             // remove notification and allow the summary to be closed now
             this._updateNotificationTimeout(0);
-            if (this._summaryTimeoutId) {
-                Mainloop.source_remove(this._summaryTimeoutId);
-                this._summaryTimeoutId = 0;
-            }
+            this._unsetSummaryTimeout();
             this._busy = true;
         } else if (status != GnomeSession.PresenceStatus.IDLE) {
             // We preserve the previous value of this._busy if the status turns to IDLE
@@ -1953,6 +1997,7 @@ const MessageTray = new Lang.Class({
             this._pointerInTray = false;
             this._pointerInSummary = false;
             this._updateNotificationTimeout(0);
+            this._unsetSummaryTimeout();
             this._updateState();
         }
         return false;
@@ -1963,6 +2008,7 @@ const MessageTray = new Lang.Class({
         this._pointerInTray = false;
         this._pointerInSummary = false;
         this._updateNotificationTimeout(0);
+        this._unsetSummaryTimeout();
         this._updateState();
     },
 
@@ -1974,7 +2020,7 @@ const MessageTray = new Lang.Class({
     _updateState: function() {
         // Notifications
         let notificationUrgent = this._notificationQueue.length > 0 && this._notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationsPending = this._notificationQueue.length > 0 && (!this._busy || notificationUrgent);
+        let notificationsPending = this._notificationQueue.length > 0 && ((!this._busy && !this._inFullscreen) || notificationUrgent);
         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
         let notificationExpanded = this._notificationBin.y < 0;
         let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked && !(this._pointerInKeyboard && notificationExpanded)) || this._notificationRemoved;
@@ -2008,15 +2054,13 @@ const MessageTray = new Lang.Class({
                               || notificationsVisible;
 
         if (this._summaryState == State.HIDDEN && !mustHideSummary) {
-            if (this._backFromAway) {
-                // Immediately set this to false, so that we don't schedule a timeout later
-                this._backFromAway = false;
-                if (!this._busy)
-                    this._showSummary(LONGER_SUMMARY_TIMEOUT);
-            } else if (notificationsDone && this._newSummaryItems.length > 0 && !this._busy) {
-                this._showSummary(SUMMARY_TIMEOUT);
-            } else if (summarySummoned) {
+            if (summarySummoned) {
                 this._showSummary(0);
+            } else if (notificationsDone && !this._busy && !this._inFullscreen) {
+                if (this._backFromAway && this._unseenNotifications.length > 0)
+                    this._showSummary(LONGER_SUMMARY_TIMEOUT);
+                else if (this._newSummaryItems.length > 0)
+                    this._showSummary(SUMMARY_TIMEOUT);
             }
         } else if (this._summaryState == State.SHOWN) {
             if (!summaryPinned || mustHideSummary)
@@ -2048,8 +2092,11 @@ const MessageTray = new Lang.Class({
             if (haveClickedSummaryItem && !summarySourceIsMainNotificationSource && canShowSummaryBoxPointer && !requestedNotificationStackIsEmpty)
                 this._showSummaryBoxPointer();
         } else if (this._summaryBoxPointerState == State.SHOWN) {
-            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideSummary)
+            if (!haveClickedSummaryItem || !canShowSummaryBoxPointer || wrongSummaryBoxPointer || mustHideSummary) {
                 this._hideSummaryBoxPointer();
+                if (wrongSummaryBoxPointer)
+                    this._showSummaryBoxPointer();
+            }
         }
 
         // Tray itself
@@ -2102,8 +2149,32 @@ const MessageTray = new Lang.Class({
                     });
     },
 
+    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
+        this.idleMonitor.remove_watch(this._idleMonitorWatchId);
+        this._idleMonitorWatchId = 0;
+
+        if (userBecameIdle) {
+            // The user became idle, which means the user was active while the notifications were
+            // shown and we can unset this._unseenNotifications .
+            this._unseenNotiications = [];
+        } else if (this._unseenNotifications.length == 1 && this._unseenNotifications[0] == this._notification) {
+            // The user became active while the only notification in this._unseenNotifications is being shown
+            // as this._notification , so we can unset this._unseenNotifications .
+            this._unseenNotifications = [];
+        } else {
+            // The user became active and we have one or more unseen notifications. We should show
+            // the message tray to the user to inform the user about the missed notifications.
+            this._backFromAway = true;
+            this._updateState();
+       }
+    },
+
     _showNotification: function() {
         this._notification = this._notificationQueue.shift();
+        this._unseenNotifications.push(this._notification);
+        if (this._idleMonitorWatchId == 0)
+            this._idleMonitorWatchId = this.idleMonitor.add_watch(1000,
+                                                                  Lang.bind(this, this._onIdleMonitorWatch));
         this._notificationClickedId = this._notification.connect('done-displaying',
                                                                  Lang.bind(this, this._escapeTray));
         this._notificationBin.child = this._notification.actor;
@@ -2182,6 +2253,13 @@ const MessageTray = new Lang.Class({
                                      Lang.bind(this, this._notificationTimeout));
     },
 
+    _unsetSummaryTimeout: function(timeout) {
+        if (this._summaryTimeoutId) {
+            Mainloop.source_remove(this._summaryTimeoutId);
+            this._summaryTimeoutId = 0;
+        }
+    },
+
     _notificationTimeout: function() {
         let [x, y, mods] = global.get_pointer();
         if (y > this._lastSeenMouseY + 10 && !this.actor.hover) {
@@ -2265,6 +2343,7 @@ const MessageTray = new Lang.Class({
     },
 
     _showSummary: function(timeout) {
+        this._updateSeenSummaryItems();
         this._summaryBin.opacity = 0;
         this._summaryBin.y = this.actor.height;
         this._tween(this._summaryBin, '_summaryState', State.SHOWN,
@@ -2279,8 +2358,6 @@ const MessageTray = new Lang.Class({
     },
 
     _showSummaryCompleted: function(timeout) {
-        this._newSummaryItems = [];
-
         if (timeout != 0) {
             this._summaryTimeoutId =
                 Mainloop.timeout_add(timeout * 1000,
@@ -2295,6 +2372,7 @@ const MessageTray = new Lang.Class({
     },
 
     _hideSummary: function() {
+        this._updateSeenSummaryItems();
         this._tween(this._summaryBin, '_summaryState', State.HIDDEN,
                     { opacity: 0,
                       time: ANIMATION_TIME,
@@ -2302,13 +2380,20 @@ const MessageTray = new Lang.Class({
                       onComplete: this._hideSummaryCompleted,
                       onCompleteScope: this,
                     });
-        this._newSummaryItems = [];
     },
 
     _hideSummaryCompleted: function() {
         this._setExpandedSummaryItem(null);
     },
 
+    _updateSeenSummaryItems: function() {
+        if (this._backFromAway) {
+            this._backFromAway = false;
+            this._unseenNotifications = [];
+        }
+        this._newSummaryItems = [];
+    },
+
     _showSummaryBoxPointer: function() {
         this._summaryBoxPointerItem = this._clickedSummaryItem;
         this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
@@ -2350,7 +2435,7 @@ const MessageTray = new Lang.Class({
     },
 
     _onSummaryBoxPointerContentUpdated: function() {
-        if (this._summaryBoxPointerItem.notificationStack.get_children().length == 0)
+        if (this._summaryBoxPointerItem.notificationStack.get_n_children() == 0)
             this._hideSummaryBoxPointer();
         this._adjustSummaryBoxPointerPosition();
 
@@ -2384,15 +2469,14 @@ const MessageTray = new Lang.Class({
         // We should be sure to hide the box pointer if all notifications in it are destroyed while
         // it is hiding, so that we don't show an an animation of an empty blob being hidden.
         if (this._summaryBoxPointerState == State.HIDING &&
-            this._summaryBoxPointerItem.notificationStack.get_children().length == 0) {
+            this._summaryBoxPointerItem.notificationStack.get_n_children() == 0) {
             this._summaryBoxPointer.actor.hide();
             return;
         }
 
         this._summaryBoxPointerState = State.HIDING;
-        // Unset this._clickedSummaryItem if we are no longer showing the summary or if
-        // this._clickedSummaryItem is still the item associated with the currently showing box pointer
-        if (this._summaryState != State.SHOWN || this._summaryBoxPointerItem == this._clickedSummaryItem)
+        // Unset this._clickedSummaryItem if we are no longer showing the summary
+        if (this._summaryState != State.SHOWN)
             this._unsetClickedSummaryItem();
 
         this._focusGrabber.ungrabFocus();
@@ -2441,15 +2525,7 @@ const SystemNotificationSource = new Lang.Class({
     Extends: Source,
 
     _init: function() {
-        this.parent(_("System Information"));
-
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: 'dialog-information',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
+        this.parent(_("System Information"), 'dialog-information', St.IconType.SYMBOLIC);
     },
 
     open: function() {

js/ui/modalDialog.js

@@ -10,6 +10,7 @@ const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Atk = imports.gi.Atk;
 
 const Params = imports.misc.params;
 
@@ -40,13 +41,14 @@ const ModalDialog = new Lang.Class({
         this._hasModal = false;
         this._shellReactive = params.shellReactive;
 
-        this._group = new St.Group({ visible: false,
-                                     x: 0,
-                                     y: 0 });
+        this._group = new St.Widget({ visible: false,
+                                      x: 0,
+                                      y: 0,
+                                      accessible_role: Atk.Role.DIALOG });
         Main.uiGroup.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.POSITION | Clutter.BindCoordinate.SIZE });
+                                                      coordinate: Clutter.BindCoordinate.ALL });
         this._group.add_constraint(constraint);
 
         this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
@@ -87,6 +89,7 @@ const ModalDialog = new Lang.Class({
                                  y_align: St.Align.START });
 
         this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+                                                visible:     false,
                                                 vertical:    false });
         this._dialogLayout.add(this._buttonLayout,
                                { expand:  true,
@@ -95,6 +98,7 @@ const ModalDialog = new Lang.Class({
 
         global.focus_manager.add_group(this._dialogLayout);
         this._initialKeyFocus = this._dialogLayout;
+        this._initialKeyFocusDestroyId = 0;
         this._savedKeyFocus = null;
     },
 
@@ -105,9 +109,11 @@ const ModalDialog = new Lang.Class({
     setButtons: function(buttons) {
         let hadChildren = this._buttonLayout.get_children() > 0;
 
-        this._buttonLayout.destroy_children();
+        this._buttonLayout.destroy_all_children();
         this._actionKeys = {};
 
+        this._buttonLayout.visible = (buttons.length > 0);
+
         for (let i = 0; i < buttons.length; i++) {
             let buttonInfo = buttons[i];
             let label = buttonInfo['label'];
@@ -129,8 +135,7 @@ const ModalDialog = new Lang.Class({
             else
                 x_alignment = St.Align.MIDDLE;
 
-            if (this._initialKeyFocus == this._dialogLayout ||
-                this._buttonLayout.contains(this._initialKeyFocus))
+            if (!this._initialKeyFocusDestroyId)
                 this._initialKeyFocus = buttonInfo.button;
             this._buttonLayout.add(buttonInfo.button,
                                    { expand: true,
@@ -175,7 +180,7 @@ const ModalDialog = new Lang.Class({
     },
 
     _fadeOpen: function() {
-        let monitor = Main.layoutManager.focusMonitor;
+        let monitor = Main.layoutManager.currentMonitor;
 
         this._backgroundBin.set_position(monitor.x, monitor.y);
         this._backgroundBin.set_size(monitor.width, monitor.height);
@@ -200,7 +205,15 @@ const ModalDialog = new Lang.Class({
     },
 
     setInitialKeyFocus: function(actor) {
+        if (this._initialKeyFocusDestroyId)
+            this._initialKeyFocus.disconnect(this._initialKeyFocusDestroyId);
+
         this._initialKeyFocus = actor;
+
+        this._initialKeyFocusDestroyId = actor.connect('destroy', Lang.bind(this, function() {
+            this._initialKeyFocus = this._dialogLayout;
+            this._initialKeyFocusDestroyId = 0;
+        }));
     },
 
     open: function(timestamp) {

js/ui/networkAgent.js

@@ -21,6 +21,8 @@
 
 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;
@@ -28,16 +30,19 @@ 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) {
-        this.parent({ styleClass: 'polkit-dialog' });
+    _init: function(agent, requestId, connection, settingName, hints, contentOverride) {
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -45,9 +50,12 @@ const NetworkSecretDialog = new Lang.Class({
         this._settingName = settingName;
         this._hints = hints;
 
-        this._content = this._getContent();
+        if (contentOverride)
+            this._content = contentOverride;
+        else
+            this._content = this._getContent();
 
-        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,
@@ -60,19 +68,19 @@ const NetworkSecretDialog = new Lang.Class({
                              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 });
 
-        let subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
+        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: 'polkit-dialog-description',
+            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,
@@ -93,12 +101,12 @@ const NetworkSecretDialog = new Lang.Class({
         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: 'polkit-dialog-password-label',
+            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: 'polkit-dialog-password-entry',
+            secret.entry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                           text: secret.value, can_focus: reactive,
                                           reactive: reactive });
             ShellEntry.addContextMenu(secret.entry,
@@ -174,14 +182,14 @@ const NetworkSecretDialog = new Lang.Class({
         }
 
         if (valid) {
-            this._agent.respond(this._requestId, false);
+            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, true);
+        this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
         this.close(global.get_current_time());
     },
 
@@ -357,6 +365,241 @@ const NetworkSecretDialog = new Lang.Class({
     }
 });
 
+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() {
+        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',
 
@@ -365,11 +608,18 @@ const NetworkAgent = new Lang.Class({
                                                 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));
     },
 
-    _newRequest:  function(agent, requestId, connection, settingName, hints) {
+    _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];
@@ -379,7 +629,74 @@ const NetworkAgent = new Lang.Class({
     },
 
     _cancelRequest: function(agent, requestId) {
-        this._dialogs[requestId].close(global.get_current_time());
-        this._dialogs[requestId].destroy();
+        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();
+            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 = GLib.build_filenamev([Config.LIBEXECDIR, binary]);
+
+                    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');
+        }
     }
 });

js/ui/notificationDaemon.js

@@ -221,12 +221,19 @@ const NotificationDaemon = new Lang.Class({
         let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
         let id;
 
+        for (let hint in hints) {
+            // unpack the variants
+            hints[hint] = hints[hint].deep_unpack();
+        }
+
+        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+
         // Filter out chat, presence, calls and invitation notifications from
         // Empathy, since we handle that information from telepathyClient.js
         if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
               hints['category'] == 'x-empathy.im.room-invitation' ||
               hints['category'] == 'x-empathy.call.incoming' ||
-              hints['category'] == 'x-empathy.call.incoming"' ||
+              hints['category'] == 'x-empathy.transfer.incoming' ||
               hints['category'] == 'x-empathy.im.subscription-request' ||
               hints['category'] == 'presence.online' ||
               hints['category'] == 'presence.offline')) {
@@ -249,13 +256,6 @@ const NotificationDaemon = new Lang.Class({
             }
         }
 
-        for (let hint in hints) {
-            // unpack the variants
-            hints[hint] = hints[hint].deep_unpack();
-        }
-
-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
-
         // Be compatible with the various hints for image data and image path
         // 'image-data' and 'image-path' are the latest name of these hints, introduced in 1.2
 
@@ -483,11 +483,11 @@ const NotificationDaemon = new Lang.Class({
     },
 
     _onTrayIconAdded: function(o, icon) {
-        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon);
+        let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon);
     },
 
     _onTrayIconRemoved: function(o, icon) {
-        let source = this._lookupSource(icon.pid, null, true);
+        let source = this._lookupSource(null, icon.pid, true);
         if (source)
             source.destroy();
     }
@@ -578,11 +578,27 @@ const Source = new Lang.Class({
         return true;
     },
 
+    _getApp: function() {
+        let app;
+
+        app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
+        if (app != null)
+            return app;
+
+        if (this.trayIcon) {
+            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wmclass);
+            if (app != null)
+                return app;
+        }
+
+        return null;
+    },
+
     _setApp: function() {
         if (this.app)
             return;
 
-        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
+        this.app = this._getApp();
         if (!this.app)
             return;
 
@@ -622,5 +638,10 @@ const Source = new Lang.Class({
         }
 
         this.parent();
+    },
+
+    createNotificationIcon: function() {
+        // We set the summary icon ourselves.
+        return null;
     }
 });

js/ui/overview.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const Config = imports.misc.config;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Mainloop = imports.mainloop;
@@ -11,16 +12,15 @@ const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;
 
 const AppDisplay = imports.ui.appDisplay;
-const ContactDisplay = imports.ui.contactDisplay;
+const ContactDisplay = Config.HAVE_FOLKS ? imports.ui.contactDisplay : null;
 const Dash = imports.ui.dash;
 const DND = imports.ui.dnd;
-const DocDisplay = imports.ui.docDisplay;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const PlaceDisplay = imports.ui.placeDisplay;
+const RemoteSearch = imports.ui.remoteSearch;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
 const Wanda = imports.ui.wanda;
@@ -99,10 +99,8 @@ const ShellInfo = new Lang.Class({
 const Overview = new Lang.Class({
     Name: 'Overview',
 
-    _init : function(params) {
-        params = Params.parse(params, { isDummy: false });
-
-        this.isDummy = params.isDummy;
+    _init : function() {
+        this.isDummy = !Main.sessionMode.hasOverview;
 
         // We only have an overview in user sessions, so
         // create a dummy overview in other cases
@@ -126,8 +124,11 @@ const Overview = new Lang.Class({
 
         this._spacing = 0;
 
-        this._group = new St.Group({ name: 'overview',
-                                     reactive: true });
+        /* Translators: This is the main view to select
+           activities. See also note for "Activities" string. */
+        this._group = new St.Widget({ name: 'overview',
+                                      accessible_name: _("Overview"),
+                                      reactive: true });
         this._group._delegate = this;
         this._group.connect('style-changed',
             Lang.bind(this, function() {
@@ -207,8 +208,11 @@ const Overview = new Lang.Class({
         this.addSearchProvider(new AppDisplay.AppSearchProvider());
         this.addSearchProvider(new AppDisplay.SettingsSearchProvider());
         this.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
-        this.addSearchProvider(new DocDisplay.DocSearchProvider());
-        this.addSearchProvider(new ContactDisplay.ContactSearchProvider());
+        if (ContactDisplay != null)
+            this.addSearchProvider(new ContactDisplay.ContactSearchProvider());
+
+        // Load remote search providers provided by applications
+        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
 
         // TODO - recalculate everything when desktop size changes
         this._dash = new Dash.Dash();
@@ -355,7 +359,7 @@ const Overview = new Lang.Class({
                 let direction;
                 if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
                     direction = stageX > this._dragStartX ? -1 : 1;
-                    if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
                         direction *= -1;
                 } else {
                     direction = stageY > this._dragStartY ? -1 : 1;
@@ -447,7 +451,7 @@ const Overview = new Lang.Class({
                     return true;
 
                 if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
-                    if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
                         this._scrollAdjustment.value -= (dx / primary.width) * this._scrollAdjustment.page_size;
                     else
                         this._scrollAdjustment.value += (dx / primary.width) * this._scrollAdjustment.page_size;
@@ -488,7 +492,7 @@ const Overview = new Lang.Class({
         this.hide();
 
         let primary = Main.layoutManager.primaryMonitor;
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
 
         let contentY = Main.panel.actor.height;
         let contentHeight = primary.height - contentY - Main.messageTray.actor.height;

js/ui/panel.js

@@ -4,15 +4,18 @@ const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Signals = imports.signals;
+const Atk = imports.gi.Atk;
 
-const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
+const DND = imports.ui.dnd;
 const Layout = imports.ui.layout;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
@@ -28,33 +31,6 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;
 
-const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
-const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
-    'a11y': imports.ui.status.accessibility.ATIndicator,
-    'volume': imports.ui.status.volume.Indicator,
-    'battery': imports.ui.status.power.Indicator,
-    'keyboard': imports.ui.status.keyboard.XKBIndicator,
-    'userMenu': imports.ui.userMenu.UserMenuButton
-};
-
-if (Config.HAVE_BLUETOOTH)
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
-
-try {
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-} catch(e) {
-    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-}
-
-const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
-const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
-    'a11y': imports.ui.status.accessibility.ATIndicator,
-    'volume': imports.ui.status.volume.Indicator,
-    'battery': imports.ui.status.power.Indicator,
-    'keyboard': imports.ui.status.keyboard.XKBIndicator,
-    'powerMenu': imports.gdm.powerMenu.PowerMenuButton
-};
-
 // To make sure the panel corners blend nicely with the panel,
 // we draw background and borders the same way, e.g. drawing
 // them as filled shapes from the outside inwards instead of
@@ -105,38 +81,47 @@ const AnimatedIcon = new Lang.Class({
     _init: function(name, size) {
         this.actor = new St.Bin({ visible: false });
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('notify::visible', Lang.bind(this, function() {
-            if (this.actor.visible) {
-                this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
-            } else {
-                if (this._timeoutId)
-                    Mainloop.source_remove(this._timeoutId);
-                this._timeoutId = 0;
-            }
-        }));
+        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibleNotify));
 
         this._timeoutId = 0;
-        this._i = 0;
+        this._frame = 0;
         this._animations = St.TextureCache.get_default().load_sliced_image (global.datadir + '/theme/' + name, size, size);
         this.actor.set_child(this._animations);
     },
 
-    _update: function() {
-        this._animations.hide_all();
-        this._animations.show();
-        if (this._i && this._i < this._animations.get_n_children())
-            this._animations.get_nth_child(this._i++).show();
-        else {
-            this._i = 1;
-            if (this._animations.get_n_children())
-                this._animations.get_nth_child(0).show();
+    _disconnectTimeout: function() {
+        if (this._timeoutId > 0) {
+            Mainloop.source_remove(this._timeoutId);
+            this._timeoutId = 0;
         }
+    },
+
+    _onVisibleNotify: function() {
+        if (this.actor.visible)
+            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
+        else
+            this._disconnectTimeout();
+    },
+
+    _showFrame: function(frame) {
+        let oldFrameActor = this._animations.get_child_at_index(this._frame);
+        if (oldFrameActor)
+            oldFrameActor.hide();
+
+        this._frame = (frame % this._animations.get_n_children());
+
+        let newFrameActor = this._animations.get_child_at_index(this._frame);
+        if (newFrameActor)
+            newFrameActor.show();
+    },
+
+    _update: function() {
+        this._showFrame(this._frame + 1);
         return true;
     },
 
     _onDestroy: function() {
-        if (this._timeoutId)
-            Mainloop.source_remove(this._timeoutId);
+        this._disconnectTimeout();
     }
 });
 
@@ -237,7 +222,9 @@ const AppMenuButton = new Lang.Class({
     Extends: PanelMenu.Button,
 
     _init: function(menuManager) {
-        this.parent(0.0, true);
+        this.parent(0.0, null, true);
+
+        this.actor.accessible_role = Atk.Role.MENU;
 
         this._startingApps = [];
 
@@ -249,6 +236,7 @@ const AppMenuButton = new Lang.Class({
         let bin = new St.Bin({ name: 'appMenu' });
         this.actor.add_actor(bin);
 
+        this.actor.bind_property("reactive", this.actor, "can-focus", 0);
         this.actor.reactive = false;
         this._targetIsCurrent = false;
 
@@ -288,7 +276,7 @@ const AppMenuButton = new Lang.Class({
 
         let tracker = Shell.WindowTracker.get_default();
         let appSys = Shell.AppSystem.get_default();
-        tracker.connect('notify::focus-app', Lang.bind(this, this._sync));
+        tracker.connect('notify::focus-app', Lang.bind(this, this._focusAppChanged));
         appSys.connect('app-state-changed', Lang.bind(this, this._onAppStateChanged));
 
         global.window_manager.connect('switch-workspace', Lang.bind(this, this._sync));
@@ -302,11 +290,12 @@ const AppMenuButton = new Lang.Class({
 
         this._visible = true;
         this.actor.show();
-        this.actor.reactive = true;
 
         if (!this._targetIsCurrent)
             return;
 
+        this.actor.reactive = true;
+
         Tweener.removeTweens(this.actor);
         Tweener.addTween(this.actor,
                          { opacity: 255,
@@ -401,12 +390,12 @@ const AppMenuButton = new Lang.Class({
 
         let [minWidth, minHeight, naturalWidth, naturalHeight] = this._iconBox.get_preferred_size();
 
-        let direction = this.actor.get_direction();
+        let direction = this.actor.get_text_direction();
 
         let yPadding = Math.floor(Math.max(0, allocHeight - naturalHeight) / 2);
         childBox.y1 = yPadding;
         childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
-        if (direction == St.TextDirection.LTR) {
+        if (direction == Clutter.TextDirection.LTR) {
             childBox.x1 = 0;
             childBox.x2 = childBox.x1 + Math.min(naturalWidth, allocWidth);
         } else {
@@ -423,7 +412,7 @@ const AppMenuButton = new Lang.Class({
         childBox.y1 = yPadding;
         childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
 
-        if (direction == St.TextDirection.LTR) {
+        if (direction == Clutter.TextDirection.LTR) {
             childBox.x1 = Math.floor(iconWidth / 2);
             childBox.x2 = Math.min(childBox.x1 + naturalWidth, allocWidth);
         } else {
@@ -432,7 +421,7 @@ const AppMenuButton = new Lang.Class({
         }
         this._label.actor.allocate(childBox, flags);
 
-        if (direction == St.TextDirection.LTR) {
+        if (direction == Clutter.TextDirection.LTR) {
             childBox.x1 = Math.floor(iconWidth / 2) + this._label.actor.width;
             childBox.x2 = childBox.x1 + this._spinner.actor.width;
             childBox.y1 = box.y1;
@@ -463,16 +452,9 @@ const AppMenuButton = new Lang.Class({
         this._sync();
     },
 
-    _sync: function() {
+    _focusAppChanged: function() {
         let tracker = Shell.WindowTracker.get_default();
-        let lastStartedApp = null;
-        let workspace = global.screen.get_active_workspace();
-        for (let i = 0; i < this._startingApps.length; i++)
-            if (this._startingApps[i].is_on_workspace(workspace))
-                lastStartedApp = this._startingApps[i];
-
         let focusedApp = tracker.focus_app;
-
         if (!focusedApp) {
             // If the app has just lost focus to the panel, pretend
             // nothing happened; otherwise you can't keynav to the
@@ -480,6 +462,17 @@ const AppMenuButton = new Lang.Class({
             if (global.stage_input_mode == Shell.StageInputMode.FOCUSED)
                 return;
         }
+        this._sync();
+    },
+
+    _sync: function() {
+        let tracker = Shell.WindowTracker.get_default();
+        let focusedApp = tracker.focus_app;
+        let lastStartedApp = null;
+        let workspace = global.screen.get_active_workspace();
+        for (let i = 0; i < this._startingApps.length; i++)
+            if (this._startingApps[i].is_on_workspace(workspace))
+                lastStartedApp = this._startingApps[i];
 
         let targetApp = focusedApp != null ? focusedApp : lastStartedApp;
 
@@ -497,6 +490,9 @@ const AppMenuButton = new Lang.Class({
             return;
         }
 
+        if (!targetApp.is_on_workspace(workspace))
+            return;
+
         if (!this._targetIsCurrent) {
             this.actor.reactive = true;
             this._targetIsCurrent = true;
@@ -528,12 +524,16 @@ const AppMenuButton = new Lang.Class({
         if (targetApp) {
             this._appMenuNotifyId = targetApp.connect('notify::menu', Lang.bind(this, this._sync));
             this._actionGroupNotifyId = targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
+        } else {
+            this._appMenuNotifyId = 0;
+            this._actionGroupNotifyId = 0;
         }
 
         this._targetApp = targetApp;
         let icon = targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
 
         this._label.setText(targetApp.get_name());
+        this.setName(targetApp.get_name());
 
         this._iconBox.set_child(icon);
         this._iconBox.show();
@@ -549,7 +549,7 @@ const AppMenuButton = new Lang.Class({
     _maybeSetMenu: function() {
         let menu;
 
-        if (this._targetApp.action_group) {
+        if (this._targetApp.action_group && this._targetApp.menu) {
             if (this.menu instanceof PopupMenu.RemoteMenu &&
                 this.menu.actionGroup == this._targetApp.action_group)
                 return;
@@ -582,6 +582,7 @@ const ActivitiesButton = new Lang.Class({
 
     _init: function() {
         this.parent(0.0);
+        this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;
 
         let container = new Shell.GenericContainer();
         container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
@@ -595,6 +596,8 @@ const ActivitiesButton = new Lang.Class({
         this._label = new St.Label({ text: _("Activities") });
         container.add_actor(this._label);
 
+        this.actor.label_actor = this._label;
+
         this._hotCorner = new Layout.HotCorner();
         container.add_actor(this._hotCorner.actor);
 
@@ -610,10 +613,12 @@ const ActivitiesButton = new Lang.Class({
         Main.overview.connect('showing', Lang.bind(this, function() {
             this.actor.add_style_pseudo_class('overview');
             this._escapeMenuGrab();
+            this.actor.add_accessible_state (Atk.StateType.CHECKED);
         }));
         Main.overview.connect('hiding', Lang.bind(this, function() {
             this.actor.remove_style_pseudo_class('overview');
             this._escapeMenuGrab();
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
         }));
 
         this._xdndTimeOut = 0;
@@ -635,7 +640,7 @@ const ActivitiesButton = new Lang.Class({
         let primary = Main.layoutManager.primaryMonitor;
         let hotBox = new Clutter.ActorBox();
         let ok, x, y;
-        if (actor.get_direction() == St.TextDirection.LTR) {
+        if (actor.get_text_direction() == Clutter.TextDirection.LTR) {
             [ok, x, y] = actor.transform_stage_point(primary.x, primary.y)
         } else {
             [ok, x, y] = actor.transform_stage_point(primary.x + primary.width, primary.y);
@@ -652,12 +657,14 @@ const ActivitiesButton = new Lang.Class({
 
     handleDragOver: function(source, actor, x, y, time) {
         if (source != Main.xdndHandler)
-            return;
+            return DND.DragMotionResult.CONTINUE;
 
         if (this._xdndTimeOut != 0)
             Mainloop.source_remove(this._xdndTimeOut);
         this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
                                                  Lang.bind(this, this._xdndShowOverview, actor));
+
+        return DND.DragMotionResult.CONTINUE;
     },
 
     _escapeMenuGrab: function() {
@@ -787,7 +794,7 @@ const PanelCorner = new Lang.Class({
 
         let rtlAwareContainer = this._box instanceof St.BoxLayout;
         if (rtlAwareContainer &&
-            this._box.get_direction() == St.TextDirection.RTL) {
+            this._box.get_text_direction() == Clutter.TextDirection.RTL) {
             if (this._side == St.Side.LEFT)
                 side = St.Side.RIGHT;
             else if (this._side == St.Side.RIGHT)
@@ -833,12 +840,10 @@ const PanelCorner = new Lang.Class({
         let node = this.actor.get_theme_node();
 
         let cornerRadius = node.get_length("-panel-corner-radius");
-        let innerBorderWidth = node.get_length('-panel-corner-inner-border-width');
-        let outerBorderWidth = node.get_length('-panel-corner-outer-border-width');
+        let borderWidth = node.get_length('-panel-corner-border-width');
 
         let backgroundColor = node.get_color('-panel-corner-background-color');
-        let innerBorderColor = node.get_color('-panel-corner-inner-border-color');
-        let outerBorderColor = node.get_color('-panel-corner-outer-border-color');
+        let borderColor = node.get_color('-panel-corner-border-color');
 
         let cr = this.actor.get_context();
         cr.setOperator(Cairo.Operator.SOURCE);
@@ -846,40 +851,23 @@ const PanelCorner = new Lang.Class({
         cr.moveTo(0, 0);
         if (this._side == St.Side.LEFT)
             cr.arc(cornerRadius,
-                   innerBorderWidth + cornerRadius,
+                   borderWidth + cornerRadius,
                    cornerRadius, Math.PI, 3 * Math.PI / 2);
         else
             cr.arc(0,
-                   innerBorderWidth + cornerRadius,
+                   borderWidth + cornerRadius,
                    cornerRadius, 3 * Math.PI / 2, 2 * Math.PI);
         cr.lineTo(cornerRadius, 0);
         cr.closePath();
 
         let savedPath = cr.copyPath();
 
-        let over = _over(innerBorderColor,
-                         _over(outerBorderColor, backgroundColor));
-        Clutter.cairo_set_source_color(cr, over);
-        cr.fill();
-
         let xOffsetDirection = this._side == St.Side.LEFT ? -1 : 1;
-        let offset = outerBorderWidth;
-        over = _over(innerBorderColor, backgroundColor);
+        let over = _over(borderColor, backgroundColor);
         Clutter.cairo_set_source_color(cr, over);
-
-        cr.save();
-        cr.translate(xOffsetDirection * offset, - offset);
-        cr.appendPath(savedPath);
-        cr.fill();
-        cr.restore();
-
-        if (this._side == St.Side.LEFT)
-            cr.rectangle(cornerRadius - offset, 0, offset, outerBorderWidth);
-        else
-            cr.rectangle(0, 0, offset, outerBorderWidth);
         cr.fill();
 
-        offset = innerBorderWidth;
+        let offset = borderWidth;
         Clutter.cairo_set_source_color(cr, backgroundColor);
 
         cr.save();
@@ -893,10 +881,10 @@ const PanelCorner = new Lang.Class({
         let node = this.actor.get_theme_node();
 
         let cornerRadius = node.get_length("-panel-corner-radius");
-        let innerBorderWidth = node.get_length('-panel-corner-inner-border-width');
+        let borderWidth = node.get_length('-panel-corner-border-width');
 
-        this.actor.set_size(cornerRadius, innerBorderWidth + cornerRadius);
-        this.actor.set_anchor_point(0, innerBorderWidth);
+        this.actor.set_size(cornerRadius, borderWidth + cornerRadius);
+        this.actor.set_anchor_point(0, borderWidth);
     }
 });
 
@@ -927,14 +915,14 @@ const Panel = new Lang.Class({
         this._rightBox = new St.BoxLayout({ name: 'panelRight' });
         this.actor.add_actor(this._rightBox);
 
-        if (this.actor.get_direction() == St.TextDirection.RTL)
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
             this._leftCorner = new PanelCorner(this._rightBox, St.Side.LEFT);
         else
             this._leftCorner = new PanelCorner(this._leftBox, St.Side.LEFT);
 
         this.actor.add_actor(this._leftCorner.actor);
 
-        if (this.actor.get_direction() == St.TextDirection.RTL)
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
             this._rightCorner = new PanelCorner(this._leftBox, St.Side.RIGHT);
         else
             this._rightCorner = new PanelCorner(this._rightBox, St.Side.RIGHT);
@@ -943,9 +931,10 @@ const Panel = new Lang.Class({
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
 
         /* Button on the left side of the panel. */
-        if (global.session_type == Shell.SessionType.USER) {
+        if (Main.sessionMode.hasOverview) {
             this._activitiesButton = new ActivitiesButton();
             this._activities = this._activitiesButton.actor;
             this._leftBox.add(this._activities);
@@ -953,28 +942,19 @@ const Panel = new Lang.Class({
             // The activities button has a pretend menu, so as to integrate
             // more cleanly with the rest of the panel
             this._menus.addMenu(this._activitiesButton.menu);
+        }
 
+        if (Main.sessionMode.hasAppMenu) {
             this._appMenu = new AppMenuButton(this._menus);
             this._leftBox.add(this._appMenu.actor);
         }
 
         /* center */
-        if (global.session_type == Shell.SessionType.USER)
-            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: true });
-        else
-            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: false });
+        this._dateMenu = new DateMenu.DateMenuButton();
         this._centerBox.add(this._dateMenu.actor, { y_fill: true });
         this._menus.addMenu(this._dateMenu.menu);
 
         /* right */
-        if (global.session_type == Shell.SessionType.GDM) {
-            this._status_area_order = GDM_STATUS_AREA_ORDER;
-            this._status_area_shell_implementation = GDM_STATUS_AREA_SHELL_IMPLEMENTATION;
-        } else {
-            this._status_area_order = STANDARD_STATUS_AREA_ORDER;
-            this._status_area_shell_implementation = STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION;
-        }
-
         Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
         Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
 
@@ -1010,7 +990,7 @@ const Panel = new Lang.Class({
 
         childBox.y1 = 0;
         childBox.y2 = allocHeight;
-        if (this.actor.get_direction() == St.TextDirection.RTL) {
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
             childBox.x1 = allocWidth - Math.min(Math.floor(sideWidth),
                                                 leftNaturalWidth);
             childBox.x2 = allocWidth;
@@ -1029,7 +1009,7 @@ const Panel = new Lang.Class({
 
         childBox.y1 = 0;
         childBox.y2 = allocHeight;
-        if (this.actor.get_direction() == St.TextDirection.RTL) {
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
             childBox.x1 = 0;
             childBox.x2 = Math.min(Math.floor(sideWidth),
                                    rightNaturalWidth);
@@ -1057,10 +1037,58 @@ const Panel = new Lang.Class({
         this._rightCorner.actor.allocate(childBox, flags);
     },
 
+    _onButtonPress: function(actor, event) {
+        if (event.get_source() != actor)
+            return false;
+
+        let button = event.get_button();
+        if (button != 1)
+            return false;
+
+        let focusWindow = global.display.focus_window;
+        if (!focusWindow)
+            return false;
+
+        let dragWindow = focusWindow.is_attached_dialog() ? focusWindow.get_transient_for()
+                                                          : focusWindow;
+        if (!dragWindow)
+            return false;
+
+        let rect = dragWindow.get_outer_rect();
+        let [stageX, stageY] = event.get_coords();
+
+        let allowDrag = dragWindow.maximized_vertically &&
+                        stageX > rect.x && stageX < rect.x + rect.width;
+
+        if (!allowDrag)
+            return false;
+
+        global.display.begin_grab_op(global.screen,
+                                     dragWindow,
+                                     Meta.GrabOp.MOVING,
+                                     false, /* pointer grab */
+                                     true, /* frame action */
+                                     button,
+                                     event.get_state(),
+                                     event.get_time(),
+                                     stageX, stageY);
+
+        return true;
+    },
+
+    openAppMenu: function() {
+        let menu = this._appMenu.menu;
+        if (!this._appMenu.actor.reactive || menu.isOpen)
+            return;
+
+        menu.open();
+        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+    },
+
     startStatusArea: function() {
-        for (let i = 0; i < this._status_area_order.length; i++) {
-            let role = this._status_area_order[i];
-            let constructor = this._status_area_shell_implementation[role];
+        for (let i = 0; i < Main.sessionMode.statusArea.order.length; i++) {
+            let role = Main.sessionMode.statusArea.order[i];
+            let constructor = Main.sessionMode.statusArea.implementation[role];
             if (!constructor) {
                 // This icon is not implemented (this is a bug)
                 continue;
@@ -1077,13 +1105,13 @@ const Panel = new Lang.Class({
         for (i = children.length - 1; i >= 0; i--) {
             let rolePosition = children[i]._rolePosition;
             if (position > rolePosition) {
-                this._rightBox.insert_actor(actor, i + 1);
+                this._rightBox.insert_child_at_index(actor, i + 1);
                 break;
             }
         }
         if (i == -1) {
             // If we didn't find a position, we must be first
-            this._rightBox.insert_actor(actor, 0);
+            this._rightBox.insert_child_at_index(actor, 0);
         }
         actor._rolePosition = position;
     },
@@ -1110,18 +1138,21 @@ const Panel = new Lang.Class({
     },
 
     _onTrayIconAdded: function(o, icon, role) {
-        if (this._status_area_shell_implementation[role]) {
+        if (Main.sessionMode.statusArea.implementation[role]) {
             // This icon is legacy, and replaced by a Shell version
             // Hide it
             return;
         }
 
+        if (Main.sessionMode.statusArea.order.indexOf(role) == -1)
+            return;
+
         icon.height = PANEL_ICON_SIZE;
         let buttonBox = new PanelMenu.ButtonBox();
         let box = buttonBox.actor;
         box.add_actor(icon);
 
-        this._insertStatusItem(box, this._status_area_order.indexOf(role));
+        this._insertStatusItem(box, Main.sessionMode.statusArea.order.indexOf(role));
     },
 
     _onTrayIconRemoved: function(o, icon) {

js/ui/panelMenu.js

@@ -6,6 +6,7 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;
@@ -96,10 +97,11 @@ const Button = new Lang.Class({
     Name: 'PanelMenuButton',
     Extends: ButtonBox,
 
-    _init: function(menuAlignment, dontCreateMenu) {
+    _init: function(menuAlignment, nameText, dontCreateMenu) {
         this.parent({ reactive: true,
                       can_focus: true,
-                      track_hover: true });
+                      track_hover: true,
+                      accessible_role: Atk.Role.MENU });
 
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
         this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
@@ -108,6 +110,24 @@ const Button = new Lang.Class({
             this.menu = null;
         else
             this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
+
+        this.setName(nameText);
+    },
+
+    setName: function(text) {
+        if (text != null) {
+            // This is the easiest way to provide a accessible name to
+            // this widget. The label could be also used for other
+            // purposes in the future.
+            if (!this.label) {
+                this.label = new St.Label({ text: text });
+                this.actor.label_actor = this.label;
+            } else
+                this.label.text = text;
+        } else {
+            this.label = null;
+            this.actor.label_actor = null;
+        }
     },
 
     setMenu: function(menu) {
@@ -129,15 +149,6 @@ const Button = new Lang.Class({
         if (!this.menu)
             return;
 
-        if (!this.menu.isOpen) {
-            // Setting the max-height won't do any good if the minimum height of the
-            // menu is higher then the screen; it's useful if part of the menu is
-            // scrollable so the minimum height is smaller than the natural height
-            let monitor = Main.layoutManager.primaryMonitor;
-            this.menu.actor.style = ('max-height: ' +
-                                     Math.round(monitor.height - Main.panel.actor.height) +
-                                     'px;');
-        }
         this.menu.toggle();
     },
 
@@ -180,6 +191,14 @@ const Button = new Lang.Class({
             this.actor.add_style_pseudo_class('active');
         else
             this.actor.remove_style_pseudo_class('active');
+
+        // Setting the max-height won't do any good if the minimum height of the
+        // menu is higher then the screen; it's useful if part of the menu is
+        // scrollable so the minimum height is smaller than the natural height
+        let monitor = Main.layoutManager.primaryMonitor;
+        this.menu.actor.style = ('max-height: ' +
+                                 Math.round(monitor.height - Main.panel.actor.height) +
+                                 'px;');
     },
 
     destroy: function() {
@@ -197,21 +216,20 @@ Signals.addSignalMethods(Button.prototype);
  *
  * This class manages one System Status indicator (network, keyboard,
  * volume, bluetooth...), which is just a PanelMenuButton with an
- * icon and a tooltip
+ * icon.
  */
 const SystemStatusButton = new Lang.Class({
     Name: 'SystemStatusButton',
     Extends: Button,
 
-    _init: function(iconName,tooltipText) {
-        this.parent(0.0);
+    _init: function(iconName, nameText) {
+        this.parent(0.0, nameText);
 
         this._iconActor = new St.Icon({ icon_name: iconName,
                                         icon_type: St.IconType.SYMBOLIC,
                                         style_class: 'system-status-icon' });
         this.actor.add_actor(this._iconActor);
         this.actor.add_style_class_name('panel-status-button');
-        this.setTooltip(tooltipText);
     },
 
     setIcon: function(iconName) {
@@ -220,16 +238,5 @@ const SystemStatusButton = new Lang.Class({
 
     setGIcon: function(gicon) {
         this._iconActor.gicon = gicon;
-    },
-
-    setTooltip: function(text) {
-        if (text != null) {
-            this.tooltip = text;
-            this.actor.has_tooltip = true;
-            this.actor.tooltip_text = text;
-        } else {
-            this.actor.has_tooltip = false;
-            this.tooltip = null;
-        }
     }
 });

js/ui/placeDisplay.js

@@ -155,9 +155,12 @@ const PlacesManager = new Lang.Class({
 
         this._connect = new PlaceInfo('special:connect', _("Connect to..."),
             function (size) {
-                return new St.Icon({ icon_name: 'applications-internet',
-                                     icon_type: St.IconType.FULLCOLOR,
-                                     icon_size: size });
+                // do NOT use St.Icon here, it crashes the shell
+                // see wanda.js for details
+                return St.TextureCache.get_default().load_icon_name(null,
+                                                                    'applications-internet',
+                                                                    St.IconType.FULLCOLOR,
+                                                                    size);
             },
             function (params) {
                 // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
@@ -186,7 +189,7 @@ const PlacesManager = new Lang.Class({
         this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
         this._updateDevices();
 
-        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']);
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']);
         this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
         this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
         this._bookmarkTimeoutId = 0;
@@ -362,35 +365,39 @@ const PlaceSearchProvider = new Lang.Class({
 
     _init: function() {
         this.parent(_("PLACES & DEVICES"));
+        this.placesManager = new PlacesManager();
     },
 
-    getResultMeta: function(resultId) {
-        let placeInfo = Main.placesManager.lookupPlaceById(resultId);
-        if (!placeInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': placeInfo.name,
-                 'createIcon': function(size) {
-                                   return placeInfo.iconFactory(size);
-                               }
-               };
+    getResultMetas: function(resultIds, callback) {
+        let metas = [];
+        for (let i = 0; i < resultIds.length; i++) {
+            let placeInfo = this.placesManager.lookupPlaceById(resultIds[i]);
+            if (!placeInfo)
+                metas.push(null);
+            else
+                metas.push({ 'id': resultIds[i],
+                             'name': placeInfo.name,
+                             'createIcon': function(size) {
+                                 return placeInfo.iconFactory(size);
+                             }
+                           });
+        }
+        callback(metas);
     },
 
     activateResult: function(id, params) {
-        let placeInfo = Main.placesManager.lookupPlaceById(id);
+        let placeInfo = this.placesManager.lookupPlaceById(id);
         placeInfo.launch(params);
     },
 
     _compareResultMeta: function (idA, idB) {
-        let infoA = Main.placesManager.lookupPlaceById(idA);
-        let infoB = Main.placesManager.lookupPlaceById(idB);
+        let infoA = this.placesManager.lookupPlaceById(idA);
+        let infoB = this.placesManager.lookupPlaceById(idB);
         return infoA.name.localeCompare(infoB.name);
     },
 
     _searchPlaces: function(places, terms) {
-        let multiplePrefixResults = [];
         let prefixResults = [];
-        let multipleSubstringResults = [];
         let substringResults = [];
 
         terms = terms.map(String.toLowerCase);
@@ -398,29 +405,26 @@ const PlaceSearchProvider = new Lang.Class({
         for (let i = 0; i < places.length; i++) {
             let place = places[i];
             let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
-                multiplePrefixResults.push(place.id);
-            else if (mtype == Search.MatchType.PREFIX)
+            if (mtype == Search.MatchType.PREFIX)
                 prefixResults.push(place.id);
-            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
-                multipleSubstringResults.push(place.id);
             else if (mtype == Search.MatchType.SUBSTRING)
                 substringResults.push(place.id);
         }
-        multiplePrefixResults.sort(this._compareResultMeta);
-        prefixResults.sort(this._compareResultMeta);
-        multipleSubstringResults.sort(this._compareResultMeta);
-        substringResults.sort(this._compareResultMeta);
-        return multiplePrefixResults.concat(prefixResults.concat(multipleSubstringResults.concat(substringResults)));
+        prefixResults.sort(Lang.bind(this, this._compareResultMeta));
+        substringResults.sort(Lang.bind(this, this._compareResultMeta));
+
+        this.searchSystem.pushResults(this, prefixResults.concat(substringResults));
     },
 
     getInitialResultSet: function(terms) {
-        let places = Main.placesManager.getAllPlaces();
-        return this._searchPlaces(places, terms);
+        let places = this.placesManager.getAllPlaces();
+        this._searchPlaces(places, terms);
     },
 
     getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
-        return this._searchPlaces(places, terms);
+        let places = previousResults.map(Lang.bind(this, function(id) {
+            return this.placesManager.lookupPlaceById(id);
+        }));
+        this._searchPlaces(places, terms);
     }
 });

js/ui/polkitAuthenticationAgent.js

@@ -41,7 +41,7 @@ const AuthenticationDialog = new Lang.Class({
     Extends: ModalDialog.ModalDialog,
 
     _init: function(actionId, message, cookie, userNames) {
-        this.parent({ styleClass: 'polkit-dialog' });
+        this.parent({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = message;
@@ -49,7 +49,7 @@ const AuthenticationDialog = new Lang.Class({
         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,
@@ -62,19 +62,19 @@ const AuthenticationDialog = new Lang.Class({
                              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 });
 
-        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;
@@ -137,9 +137,9 @@ const AuthenticationDialog = new Lang.Class({
 
         this._passwordBox = new St.BoxLayout({ vertical: false });
         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._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 });
@@ -149,13 +149,13 @@ const AuthenticationDialog = new Lang.Class({
         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);
@@ -165,8 +165,9 @@ const AuthenticationDialog = new Lang.Class({
          * 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);
@@ -393,6 +394,7 @@ const AuthenticationAgent = new Lang.Class({
                                  Lang.bind(this,
                                            function() {
                                                this._reallyCompleteRequest(wasDismissed);
+                                               return false;
                                            }));
         } else {
             this._reallyCompleteRequest(wasDismissed);

js/ui/popupMenu.js

@@ -9,6 +9,7 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
@@ -41,7 +42,8 @@ const PopupBaseMenuItem = new Lang.Class({
         this.actor = new Shell.GenericContainer({ style_class: 'popup-menu-item',
                                                   reactive: params.reactive,
                                                   track_hover: params.reactive,
-                                                  can_focus: params.reactive });
+                                                  can_focus: params.reactive,
+                                                  accessible_role: Atk.Role.MENU_ITEM});
         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));
@@ -273,7 +275,7 @@ const PopupBaseMenuItem = new Lang.Class({
 
     _allocate: function(actor, box, flags) {
         let height = box.y2 - box.y1;
-        let direction = this.actor.get_direction();
+        let direction = this.actor.get_text_direction();
 
         if (this._dot) {
             // The dot is placed outside box
@@ -283,7 +285,7 @@ const PopupBaseMenuItem = new Lang.Class({
             let dotBox = new Clutter.ActorBox();
             let dotWidth = Math.round(box.x1 / 2);
 
-            if (direction == St.TextDirection.LTR) {
+            if (direction == Clutter.TextDirection.LTR) {
                 dotBox.x1 = Math.round(box.x1 / 4);
                 dotBox.x2 = dotBox.x1 + dotWidth;
             } else {
@@ -296,7 +298,7 @@ const PopupBaseMenuItem = new Lang.Class({
         }
 
         let x;
-        if (direction == St.TextDirection.LTR)
+        if (direction == Clutter.TextDirection.LTR)
             x = box.x1;
         else
             x = box.x2;
@@ -311,7 +313,7 @@ const PopupBaseMenuItem = new Lang.Class({
             let availWidth, extraWidth;
             if (this._columnWidths) {
                 if (child.span == -1) {
-                    if (direction == St.TextDirection.LTR)
+                    if (direction == Clutter.TextDirection.LTR)
                         availWidth = box.x2 - x;
                     else
                         availWidth = x - box.x1;
@@ -323,7 +325,7 @@ const PopupBaseMenuItem = new Lang.Class({
                 extraWidth = availWidth - naturalWidth;
             } else {
                 if (child.span == -1) {
-                    if (direction == St.TextDirection.LTR)
+                    if (direction == Clutter.TextDirection.LTR)
                         availWidth = box.x2 - x;
                     else
                         availWidth = x - box.x1;
@@ -333,7 +335,7 @@ const PopupBaseMenuItem = new Lang.Class({
                 extraWidth = 0;
             }
 
-            if (direction == St.TextDirection.LTR) {
+            if (direction == Clutter.TextDirection.LTR) {
                 if (child.expand) {
                     childBox.x1 = x;
                     childBox.x2 = x + availWidth;
@@ -371,7 +373,7 @@ const PopupBaseMenuItem = new Lang.Class({
 
             child.actor.allocate(childBox, flags);
 
-            if (direction == St.TextDirection.LTR)
+            if (direction == Clutter.TextDirection.LTR)
                 x += availWidth + this._spacing;
             else
                 x -= availWidth + this._spacing;
@@ -389,6 +391,7 @@ const PopupMenuItem = new Lang.Class({
 
         this.label = new St.Label({ text: text });
         this.addActor(this.label);
+        this.actor.label_actor = this.label
     }
 });
 
@@ -443,6 +446,7 @@ const PopupAlternatingMenuItem = new Lang.Class({
         this.label = new St.Label({ text: text });
         this.state = PopupAlternatingMenuItemState.DEFAULT;
         this.addActor(this.label);
+        this.actor.label_actor = this.label;
 
         this.actor.connect('notify::mapped', Lang.bind(this, this._onMapped));
     },
@@ -542,6 +546,10 @@ const PopupSliderMenuItem = new Lang.Class({
         this._slider.connect('repaint', Lang.bind(this, this._sliderRepaint));
         this.actor.connect('button-press-event', Lang.bind(this, this._startDragging));
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this.actor.connect('notify::mapped', Lang.bind(this, function() {
+            if (!this.actor.mapped)
+                this._endDragging();
+        }));
 
         this._releaseId = this._motionId = 0;
         this._dragging = false;
@@ -710,7 +718,8 @@ const Switch = new Lang.Class({
     Name: 'Switch',
 
     _init: function(state) {
-        this.actor = new St.Bin({ style_class: 'toggle-switch' });
+        this.actor = new St.Bin({ style_class: 'toggle-switch',
+                                  accessible_role: Atk.Role.CHECK_BOX});
         // Translators: this MUST be either "toggle-switch-us"
         // (for toggle switches containing the English words
         // "ON" and "OFF") or "toggle-switch-intl" (for toggle
@@ -743,6 +752,10 @@ const PopupSwitchMenuItem = new Lang.Class({
         this.label = new St.Label({ text: text });
         this._switch = new Switch(active);
 
+        this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
+        this.checkAccessibleState();
+        this.actor.label_actor = this.label;
+
         this.addActor(this.label);
 
         this._statusBin = new St.Bin({ x_align: St.Align.END });
@@ -761,11 +774,14 @@ const PopupSwitchMenuItem = new Lang.Class({
             this._statusBin.child = this._statusLabel;
             this.actor.reactive = false;
             this.actor.can_focus = false;
+            this.actor.accessible_role = Atk.Role.MENU_ITEM;
         } else {
             this._statusBin.child = this._switch.actor;
             this.actor.reactive = true;
             this.actor.can_focus = true;
+            this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
         }
+        this.checkAccessibleState();
     },
 
     activate: function(event) {
@@ -773,12 +789,19 @@ const PopupSwitchMenuItem = new Lang.Class({
             this.toggle();
         }
 
+        // we allow pressing space to toggle the switch
+        // without closing the menu
+        if (event.type() == Clutter.EventType.KEY_PRESS &&
+            event.get_key_symbol() == Clutter.KEY_space)
+            return;
+
         this.parent(event);
     },
 
     toggle: function() {
         this._switch.toggle();
         this.emit('toggled', this._switch.state);
+        this.checkAccessibleState();
     },
 
     get state() {
@@ -787,6 +810,20 @@ const PopupSwitchMenuItem = new Lang.Class({
 
     setToggleState: function(state) {
         this._switch.setToggleState(state);
+        this.checkAccessibleState();
+    },
+
+    checkAccessibleState: function() {
+        switch (this.actor.accessible_role) {
+        case Atk.Role.CHECK_MENU_ITEM:
+            if (this._switch.state)
+                this.actor.add_accessible_state (Atk.StateType.CHECKED);
+            else
+                this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+            break;
+        default:
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+        }
     }
 });
 
@@ -851,8 +888,7 @@ const PopupMenuBase = new Lang.Class({
     },
 
     addSettingsAction: function(title, desktopFile) {
-        // Don't allow user settings to get edited unless we're in a user session
-        if (global.session_type != Shell.SessionType.USER)
+        if (!Main.sessionMode.allowSettings)
             return null;
 
         let menuItem = this.addAction(title, function() {
@@ -869,6 +905,10 @@ const PopupMenuBase = new Lang.Class({
         return menuItem;
     },
 
+    isEmpty: function() {
+        return this.box.get_n_children() == 0;
+    },
+
     isChildMenu: function(menu) {
         return this._childMenus.indexOf(menu) != -1;
     },
@@ -999,10 +1039,12 @@ const PopupMenuBase = new Lang.Class({
             let items = this._getMenuItems();
             if (position < items.length) {
                 before_item = items[position].actor;
-                this.box.insert_before(menuItem.actor, before_item);
-            } else
+                this.box.insert_child_below(menuItem.actor, before_item);
+            } else {
                 this.box.add(menuItem.actor);
+            }
         }
+
         if (menuItem instanceof PopupMenuSection) {
             this._connectSubMenuSignals(menuItem, menuItem);
             menuItem._closingId = this.connect('open-state-changed',
@@ -1020,7 +1062,7 @@ const PopupMenuBase = new Lang.Class({
             if (before_item == null)
                 this.box.add(menuItem.menu.actor);
             else
-                this.box.insert_before(menuItem.menu.actor, before_item);
+                this.box.insert_child_below(menuItem.menu.actor, before_item);
             this._connectSubMenuSignals(menuItem, menuItem.menu);
             this._connectItemSignals(menuItem);
             menuItem._closingId = this.connect('open-state-changed', function(self, open) {
@@ -1194,6 +1236,9 @@ const PopupMenu = new Lang.Class({
         if (this.isOpen)
             return;
 
+        if (this.isEmpty())
+            return;
+
         this.isOpen = true;
 
         this._boxPointer.setPosition(this.sourceActor, this._arrowAlignment);
@@ -1285,6 +1330,9 @@ const PopupSubMenu = new Lang.Class({
         if (this.isOpen)
             return;
 
+        if (this.isEmpty())
+            return;
+
         this.isOpen = true;
 
         this.actor.show();
@@ -1398,12 +1446,23 @@ const PopupMenuSection = new Lang.Class({
         this.actor = this.box;
         this.actor._delegate = this;
         this.isOpen = true;
+
+        // an array of externally managed separators
+        this.separators = [];
     },
 
     // deliberately ignore any attempt to open() or close(), but emit the
     // corresponding signal so children can still pick it up
     open: function(animate) { this.emit('open-state-changed', true); },
     close: function() { this.emit('open-state-changed', false); },
+
+    destroy: function() {
+        for (let i = 0; i < this.separators.length; i++)
+            this.separators[i].destroy();
+        this.separators = [];
+
+        this.parent();
+    }
 });
 
 const PopupSubMenuMenuItem = new Lang.Class({
@@ -1417,6 +1476,7 @@ const PopupSubMenuMenuItem = new Lang.Class({
 
         this.label = new St.Label({ text: text });
         this.addActor(this.label);
+        this.actor.label_actor = this.label;
         this._triangle = new St.Label({ text: '\u25B8' });
         this.addActor(this._triangle, { align: St.Align.END });
 
@@ -1517,6 +1577,9 @@ const PopupComboMenu = new Lang.Class({
         if (this.isOpen)
             return;
 
+        if (this.isEmpty())
+            return;
+
         this.isOpen = true;
 
         let [sourceX, sourceY] = this.sourceActor.get_transformed_position();
@@ -1560,6 +1623,10 @@ const PopupComboMenu = new Lang.Class({
         this._activeItemPos = position;
     },
 
+    getActiveItem: function() {
+        return this._getMenuItems()[this._activeItemPos];
+    },
+
     setItemVisible: function(position, visible) {
         if (!visible && position == this._activeItemPos) {
             log('Trying to hide the active menu item.');
@@ -1581,6 +1648,8 @@ const PopupComboBoxMenuItem = new Lang.Class({
     _init: function (params) {
         this.parent(params);
 
+        this.actor.accessible_role = Atk.Role.COMBO_BOX;
+
         this._itemBox = new Shell.Stack();
         this.addActor(this._itemBox);
 
@@ -1677,6 +1746,11 @@ const PopupComboBoxMenuItem = new Lang.Class({
                          Lang.bind(this, this._itemActivated, position));
     },
 
+    checkAccessibleLabel: function() {
+        let activeItem = this._menu.getActiveItem();
+        this.actor.label_actor = activeItem.label;
+    },
+
     setActiveItem: function(position) {
         let item = this._items[position];
         if (!item)
@@ -1687,6 +1761,8 @@ const PopupComboBoxMenuItem = new Lang.Class({
         this._activeItemPos = position;
         for (let i = 0; i < this._items.length; i++)
             this._items[i].visible = (i == this._activeItemPos);
+
+        this.checkAccessibleLabel();
     },
 
     setItemVisible: function(position, visible) {
@@ -1737,17 +1813,25 @@ const RemoteMenu = new Lang.Class({
     },
 
     _createMenuItem: function(model, index) {
+        let labelValue = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_LABEL, null);
+        let label = labelValue ? labelValue.deep_unpack() : '';
+        // remove all underscores that are not followed by another underscore
+        label = label.replace(/_([^_])/, '$1');
+
         let section_link = model.get_item_link(index, Gio.MENU_LINK_SECTION);
         if (section_link) {
             let item = new PopupMenuSection();
+            if (label) {
+                let title = new PopupMenuItem(label, { reactive: false,
+                                                       style_class: 'popup-subtitle-menu-item' });
+                item._titleMenuItem = title;
+                title._ignored = true;
+                item.addMenuItem(title);
+            }
             this._modelChanged(section_link, 0, 0, section_link.get_n_items(), item);
             return [item, true, ''];
         }
 
-        // labels are not checked for existance, as they're required for all items
-        let label = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_LABEL, null).deep_unpack();
-        // remove all underscores that are not followed by another underscore
-        label = label.replace(/_([^_])/, '$1');
         let submenu_link = model.get_item_link(index, Gio.MENU_LINK_SUBMENU);
 
         if (submenu_link) {
@@ -1831,8 +1915,13 @@ const RemoteMenu = new Lang.Class({
 
         let currentItems = target._getMenuItems();
 
-        for (j0 = 0, k0 = 0; j0 < position; j0++, k0++) {
-            if (currentItems[k0] instanceof PopupSeparatorMenuItem)
+        k0 = 0;
+        // skip ignored items at the beginning
+        while (k0 < currentItems.length && currentItems[k0]._ignored)
+            k0++;
+        // find the right menu item matching the model item
+        for (j0 = 0; k0 < currentItems.length && j0 < position; j0++, k0++) {
+            if (currentItems[k0]._ignored)
                 k0++;
         }
 
@@ -1841,10 +1930,10 @@ const RemoteMenu = new Lang.Class({
             for (k = k0; k < currentItems.length; k++)
                 currentItems[k].destroy();
         } else {
-            for (j = j0, k = k0; j < j0 + removed; j++, k++) {
+            for (j = j0, k = k0; k < currentItems.length && j < j0 + removed; j++, k++) {
                 currentItems[k].destroy();
 
-                if (currentItems[k] instanceof PopupSeparatorMenuItem)
+                if (currentItems[k]._ignored)
                     j--;
             }
         }
@@ -1855,19 +1944,26 @@ const RemoteMenu = new Lang.Class({
             if (item) {
                 // separators must be added in the parent to make autohiding work
                 if (addSeparator) {
-                    target.addMenuItem(new PopupSeparatorMenuItem(), k+1);
+                    let separator = new PopupSeparatorMenuItem();
+                    item.separators.push(separator);
+                    separator._ignored = true;
+                    target.addMenuItem(separator, k+1);
                     k++;
                 }
 
                 target.addMenuItem(item, k);
 
                 if (addSeparator) {
-                    target.addMenuItem(new PopupSeparatorMenuItem(), k+1);
+                    let separator = new PopupSeparatorMenuItem();
+                    item.separators.push(separator);
+                    separator._ignored = true;
+                    target.addMenuItem(separator, k+1);
                     k++;
                 }
             } else if (changeSignal) {
-                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function() {
-                    this.actionGroup.disconnect(signalId);
+                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function(actionGroup, actionName) {
+                    actionGroup.disconnect(signalId);
+                    if (this._actions[actionName]) return;
 
                     // force a full update
                     this._modelChanged(model, 0, -1, model.get_n_items(), target);
@@ -1888,7 +1984,10 @@ const RemoteMenu = new Lang.Class({
         }
 
         if (target instanceof PopupMenuSection) {
-            target.actor.visible = target.numMenuItems != 0;
+            if (target._titleMenuItem)
+                target.actor.visible = target.numMenuItems != 1;
+            else
+                target.actor.visible = target.numMenuItems != 0;
         } else {
             let sourceItem = target.sourceActor._delegate;
             if (sourceItem instanceof PopupSubMenuMenuItem)

js/ui/remoteSearch.js

@@ -0,0 +1,199 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const St = imports.gi.St;
+
+const FileUtils = imports.misc.fileUtils;
+const Search = imports.ui.search;
+
+const KEY_FILE_GROUP = 'Shell Search Provider';
+
+const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">
+<method name="GetInitialResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetSubsearchResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetResultMetas">
+    <arg type="as" direction="in" />
+    <arg type="aa{sv}" direction="out" />
+</method>
+<method name="ActivateResult">
+    <arg type="s" direction="in" />
+</method>
+</interface>;
+
+var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
+
+
+function loadRemoteSearchProviders(addProviderCallback) {
+    let dataDirs = GLib.get_system_data_dirs();
+    for (let i = 0; i < dataDirs.length; i++) {
+        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'search-providers']);
+        let dir = Gio.file_new_for_path(path);
+        if (!dir.query_exists(null))
+            continue;
+        loadRemoteSearchProvidersFromDir(dir, addProviderCallback);
+    }
+};
+
+function loadRemoteSearchProvidersFromDir(dir, addProviderCallback) {
+    let dirPath = dir.get_path();
+    FileUtils.listDirAsync(dir, Lang.bind(this, function(files) {
+        for (let i = 0; i < files.length; i++) {
+            let keyfile = new GLib.KeyFile();
+            let path = GLib.build_filenamev([dirPath, files[i].get_name()]);
+
+            try {
+                keyfile.load_from_file(path, 0);
+            } catch(e) {
+                continue;
+            }
+
+            if (!keyfile.has_group(KEY_FILE_GROUP))
+                continue;
+
+            let remoteProvider, title;
+            try {
+                let group = KEY_FILE_GROUP;
+                let busName = keyfile.get_string(group, 'BusName');
+                let objectPath = keyfile.get_string(group, 'ObjectPath');
+
+                let appInfo = null;
+                try {
+                    let desktopId = keyfile.get_string(group, 'DesktopId');
+                    appInfo = Gio.DesktopAppInfo.new(desktopId);
+                } catch (e) {
+                }
+
+                let icon;
+                if (appInfo) {
+                    icon = appInfo.get_icon();
+                    title = appInfo.get_name();
+                } else {
+                    let iconName = keyfile.get_string(group, 'Icon');
+                    icon = new Gio.ThemedIcon({ name: iconName });
+                    title = keyfile.get_locale_string(group, 'Title', null);
+                }
+
+                remoteProvider = new RemoteSearchProvider(title,
+                                                          icon,
+                                                          busName,
+                                                          objectPath);
+            } catch(e) {
+                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
+                continue;
+            }
+
+            addProviderCallback(remoteProvider);
+        }
+    }));
+
+};
+
+const RemoteSearchProvider = new Lang.Class({
+    Name: 'RemoteSearchProvider',
+    Extends: Search.SearchProvider,
+
+    _init: function(title, icon, dbusName, dbusPath) {
+        this._proxy = new SearchProviderProxy(Gio.DBus.session,
+                                              dbusName, dbusPath);
+
+        this.parent(title.toUpperCase());
+        this._cancellable = new Gio.Cancellable();
+    },
+
+    createIcon: function(size, meta) {
+        if (meta['gicon']) {
+            return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),
+                                 icon_size: size,
+                                 icon_type: St.IconType.FULLCOLOR });
+        } else if (meta['icon-data']) {
+            let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = meta['icon-data'];
+            let textureCache = St.TextureCache.get_default();
+            return textureCache.load_from_raw(data, hasAlpha,
+                                              width, height, rowStride, size);
+        }
+
+        // Ugh, but we want to fall back to something ...
+        return new St.Icon({ icon_name: 'text-x-generic',
+                             icon_size: size,
+                             icon_type: St.IconType.FULLCOLOR });
+    },
+
+    _getResultsFinished: function(results, error) {
+        if (error)
+            return;
+        this.searchSystem.pushResults(this, results[0]);
+    },
+
+    getInitialResultSet: function(terms) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            this._proxy.GetInitialResultSetRemote(terms,
+                                                  Lang.bind(this, this._getResultsFinished),
+                                                  this._cancellable);
+        } catch(e) {
+            log('Error calling GetInitialResultSet for provider %s: %s'.format( this.title, e.toString()));
+            this.searchSystem.pushResults(this, []);
+        }
+    },
+
+    getSubsearchResultSet: function(previousResults, newTerms) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            this._proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
+                                                    Lang.bind(this, this._getResultsFinished),
+                                                    this._cancellable);
+        } catch(e) {
+            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.title, e.toString()));
+            this.searchSystem.pushResults(this, []);
+        }
+    },
+
+    _getResultMetasFinished: function(results, error, callback) {
+        if (error) {
+            callback([]);
+            return;
+        }
+        let metas = results[0];
+        let resultMetas = [];
+        for (let i = 0; i < metas.length; i++) {
+            for (let prop in metas[i])
+                metas[i][prop] = metas[i][prop].deep_unpack();
+            resultMetas.push({ id: metas[i]['id'],
+                               name: metas[i]['name'],
+                               createIcon: Lang.bind(this,
+                                                     this.createIcon, metas[i]) });
+        }
+        callback(resultMetas);
+    },
+
+    getResultMetas: function(ids, callback) {
+        this._cancellable.cancel();
+        this._cancellable.reset();
+        try {
+            this._proxy.GetResultMetasRemote(ids,
+                                             Lang.bind(this, this._getResultMetasFinished, callback),
+                                             this._cancellable);
+        } catch(e) {
+            log('Error calling GetResultMetas for provider %s: %s'.format(this.title, e.toString()));
+            callback([]);
+        }
+    },
+
+    activateResult: function(id) {
+        this._proxy.ActivateResultRemote(id);
+    }
+});
+
+

js/ui/runDialog.js

@@ -209,6 +209,8 @@ const RunDialog = new Lang.Class({
         let entry = new St.Entry({ style_class: 'run-dialog-entry' });
         ShellEntry.addContextMenu(entry);
 
+        entry.label_actor = label;
+
         this._entryText = entry.clutter_text;
         this.contentLayout.add(entry, { y_align: St.Align.START });
         this.setInitialKeyFocus(this._entryText);
@@ -242,7 +244,7 @@ const RunDialog = new Lang.Class({
             let symbol = e.get_key_symbol();
             if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
                 this.popModal();
-                if (Shell.get_event_state(e) & Clutter.ModifierType.CONTROL_MASK)
+                if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
                     this._run(o.get_text(), true);
                 else
                     this._run(o.get_text(), false);

js/ui/search.js

@@ -18,9 +18,7 @@ const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';
 const MatchType = {
     NONE: 0,
     SUBSTRING: 1,
-    MULTIPLE_SUBSTRING: 2,
-    PREFIX: 3,
-    MULTIPLE_PREFIX: 4
+    PREFIX: 2
 };
 
 const SearchResultDisplay = new Lang.Class({
@@ -29,7 +27,6 @@ const SearchResultDisplay = new Lang.Class({
     _init: function(provider) {
         this.provider = provider;
         this.actor = null;
-        this.selectionIndex = -1;
     },
 
     /**
@@ -51,20 +48,10 @@ const SearchResultDisplay = new Lang.Class({
 
     /**
      * clear:
-     * Remove all results from this display and reset the selection index.
+     * Remove all results from this display.
      */
     clear: function() {
-        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
-        this.selectionIndex = -1;
-    },
-
-    /**
-     * getSelectionIndex:
-     *
-     * Returns the index of the selected actor, or -1 if none.
-     */
-    getSelectionIndex: function() {
-        return this.selectionIndex;
+        this.actor.destroy_all_children();
     },
 
     /**
@@ -75,25 +62,6 @@ const SearchResultDisplay = new Lang.Class({
     getVisibleResultCount: function() {
         throw new Error('Not implemented');
     },
-
-    /**
-     * selectIndex:
-     * @index: Integer index
-     *
-     * Move selection to the given index.
-     * Return true if successful, false if no more results
-     * available.
-     */
-    selectIndex: function() {
-        throw new Error('Not implemented');
-    },
-
-    /**
-     * Activate the currently selected search result.
-     */
-    activateSelected: function() {
-        throw new Error('Not implemented');
-    }
 });
 
 /**
@@ -102,6 +70,8 @@ const SearchResultDisplay = new Lang.Class({
  * Subclass this object to add a new result type
  * to the search system, then call registerProvider()
  * in SearchSystem with an instance.
+ * Search is asynchronous and uses the
+ * getInitialResultSet()/getSubsearchResultSet() methods.
  */
 const SearchProvider = new Lang.Class({
     Name: 'SearchProvider',
@@ -109,42 +79,6 @@ const SearchProvider = new Lang.Class({
     _init: function(title) {
         this.title = title;
         this.searchSystem = null;
-        this.searchAsync  = false;
-    },
-
-    _asyncCancelled: function() {
-    },
-
-    startAsync: function() {
-        this.searchAsync = true;
-    },
-
-    tryCancelAsync: function() {
-        if (!this.searchAsync)
-            return;
-        this._asyncCancelled();
-        this.searchAsync = false;
-    },
-
-    /**
-     * addItems:
-     * @items: an array of result identifier strings representing
-     * items which match the last given search terms.
-     *
-     * This should be used for something that requires a bit more
-     * logic; it's designed to be an asyncronous way to add a result
-     * to the current search.
-     */
-    addItems: function(items) {
-        if (!this.searchSystem)
-            throw new Error('Search provider not registered');
-
-        if (!items.length)
-            return;
-
-        this.tryCancelAsync();
-
-        this.searchSystem.addProviderItems(this, items);
     },
 
     /**
@@ -155,7 +89,7 @@ const SearchProvider = new Lang.Class({
      * therefore a single term of length one or two), or when
      * a new term is added.
      *
-     * Should return an array of result identifier strings representing
+     * Should "return" an array of result identifier strings representing
      * items which match the given search terms.  This
      * is expected to be a substring match on the metadata for a given
      * item.  Ordering of returned results is up to the discretion of the provider,
@@ -165,6 +99,9 @@ const SearchProvider = new Lang.Class({
      *    description) before single matches
      *  * Put items which match on a prefix before non-prefix substring matches
      *
+     * We say "return" above, but in order to make the query asynchronous, use
+     * this.searchSystem.pushResults();. The return value should be ignored.
+     *
      * This function should be fast; do not perform unindexed full-text searches
      * or network queries.
      */
@@ -184,20 +121,23 @@ const SearchProvider = new Lang.Class({
      *
      * This allows search providers to only search through the previous
      * result set, rather than possibly performing a full re-query.
+     *
+     * Similar to getInitialResultSet, the return value for this will
+     * be ignored; use this.searchSystem.pushResults();.
      */
     getSubsearchResultSet: function(previousResults, newTerms) {
         throw new Error('Not implemented');
     },
 
     /**
-     * getResultMeta:
-     * @id: Result identifier string
+     * getResultMetas:
+     * @ids: Result identifier strings
      *
-     * Return an object with 'id', 'name', (both strings) and 'createIcon'
-     * (function(size) returning a Clutter.Texture) properties which describe
-     * the given search result.
+     * Call callback with array of objects with 'id', 'name', (both strings) and
+     * 'createIcon' (function(size) returning a Clutter.Texture) properties
+     * with the same number of members as @ids
      */
-    getResultMeta: function(id) {
+    getResultMetas: function(ids, callback) {
         throw new Error('Not implemented');
     },
 
@@ -302,7 +242,7 @@ const OpenSearchSystem = new Lang.Class({
     },
 
     _addProvider: function(fileName) {
-        let path = global.datadir + '/search_providers/' + fileName;
+        let path = global.datadir + '/open-search-providers/' + fileName;
         let source = Shell.get_file_contents_utf8_sync(path);
         let [success, name, url, langs, icon_uri] = Shell.parse_search_provider(source);
         let provider ={ name: name,
@@ -319,7 +259,7 @@ const OpenSearchSystem = new Lang.Class({
     _refresh: function() {
         this._providers = [];
         let names = global.settings.get_strv(DISABLED_OPEN_SEARCH_PROVIDERS_KEY);
-        let file = Gio.file_new_for_path(global.datadir + '/search_providers');
+        let file = Gio.file_new_for_path(global.datadir + '/open-search-providers');
         FileUtils.listDirAsync(file, Lang.bind(this, function(files) {
             for (let i = 0; i < files.length; i++) {
                 let enabled = true;
@@ -369,8 +309,13 @@ const SearchSystem = new Lang.Class({
         this._previousResults = [];
     },
 
-    addProviderItems: function(provider, items) {
-        this.emit('search-updated', provider, items);
+    pushResults: function(provider, results) {
+        let i = this._providers.indexOf(provider);
+        if (i == -1)
+            return;
+
+        this._previousResults[i] = [provider, results];
+        this.emit('search-updated', this._previousResults[i]);
     },
 
     updateSearch: function(searchString) {
@@ -396,34 +341,33 @@ const SearchSystem = new Lang.Class({
             }
         }
 
+        let previousResultsArr = this._previousResults;
+
         let results = [];
+        this._previousTerms = terms;
+        this._previousResults = results;
+
         if (isSubSearch) {
             for (let i = 0; i < this._providers.length; i++) {
-                let [provider, previousResults] = this._previousResults[i];
-                provider.tryCancelAsync();
+                let [provider, previousResults] = previousResultsArr[i];
                 try {
-                    let providerResults = provider.getSubsearchResultSet(previousResults, terms);
-                    results.push([provider, providerResults]);
+                    results.push([provider, []]);
+                    provider.getSubsearchResultSet(previousResults, terms);
                 } catch (error) {
-                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                 }
             }
         } else {
             for (let i = 0; i < this._providers.length; i++) {
                 let provider = this._providers[i];
-                provider.tryCancelAsync();
                 try {
-                    let providerResults = provider.getInitialResultSet(terms);
-                    results.push([provider, providerResults]);
+                    results.push([provider, []]);
+                    provider.getInitialResultSet(terms);
                 } catch (error) {
-                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                 }
             }
         }
-
-        this._previousTerms = terms;
-        this._previousResults = results;
-        this.emit('search-completed', results);
     },
 });
 Signals.addSignalMethods(SearchSystem.prototype);

js/ui/searchDisplay.js

@@ -5,6 +5,7 @@ const Lang = imports.lang;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
+const Atk = imports.gi.Atk;
 
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
@@ -32,12 +33,14 @@ const SearchResult = new Lang.Class({
         if (content == null) {
             content = new St.Bin({ style_class: 'search-result-content',
                                    reactive: true,
-                                   track_hover: true });
+                                   can_focus: true,
+                                   track_hover: true,
+                                   accessible_role: Atk.Role.PUSH_BUTTON });
             let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
                                              { createIcon: this.metaInfo['createIcon'] });
             content.set_child(icon.actor);
             this._dragActorSource = icon.icon;
-            this.actor.label_actor = icon.label;
+            content.label_actor = icon.label;
         } else {
             if (content._delegate && content._delegate.getDragActorSource)
                 this._dragActorSource = content._delegate.getDragActorSource();
@@ -110,70 +113,60 @@ const GridSearchResults = new Lang.Class({
         this.actor = new St.Bin({ x_align: St.Align.START });
 
         this.actor.set_child(this._grid.actor);
-        this.selectionIndex = -1;
         this._width = 0;
         this.actor.connect('notify::width', Lang.bind(this, function() {
             this._width = this.actor.width;
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._tryAddResults();
+                let results = this.getResultsForDisplay();
+                if (results.length == 0)
+                    return;
+
+                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
             }));
         }));
         this._notDisplayedResult = [];
         this._terms = [];
+        this._pendingClear = false;
     },
 
-    _tryAddResults: function() {
-        let canDisplay = this._grid.childrenInRow(this._width) * MAX_SEARCH_RESULTS_ROWS
-                         - this._grid.visibleItemsCount();
+    getResultsForDisplay: function() {
+        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
+        let canDisplay = this._grid.childrenInRow(this._width) * this._grid.getRowLimit()
+                         - alreadyVisible;
 
-        for (let i = Math.min(this._notDisplayedResult.length, canDisplay); i > 0; i--) {
-            let result = this._notDisplayedResult.shift();
-            let meta = this.provider.getResultMeta(result);
-            let display = new SearchResult(this.provider, meta, this._terms);
-            this._grid.addItem(display.actor);
-        }
+        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
+
+        return this._notDisplayedResult.splice(0, numResults);
     },
 
     getVisibleResultCount: function() {
         return this._grid.visibleItemsCount();
     },
 
-    renderResults: function(results, terms) {
+    setResults: function(results, terms) {
         // copy the lists
         this._notDisplayedResult = results.slice(0);
         this._terms = terms.slice(0);
-        this._tryAddResults();
+        this._pendingClear = true;
+    },
+
+    renderResults: function(metas) {
+        for (let i = 0; i < metas.length; i++) {
+            let display = new SearchResult(this.provider, metas[i], this._terms);
+            this._grid.addItem(display.actor);
+        }
     },
 
     clear: function () {
-        this._terms = [];
-        this._notDisplayedResult = [];
         this._grid.removeAll();
-        this.selectionIndex = -1;
+        this._pendingClear = false;
     },
 
-    selectIndex: function (index) {
-        let nVisible = this.getVisibleResultCount();
-        if (this.selectionIndex >= 0) {
-            let prevActor = this._grid.getItemAtIndex(this.selectionIndex);
-            prevActor._delegate.setSelected(false);
-        }
-        this.selectionIndex = -1;
-        if (index >= nVisible)
-            return false;
-        else if (index < 0)
-            return false;
-        let targetActor = this._grid.getItemAtIndex(index);
-        targetActor._delegate.setSelected(true);
-        this.selectionIndex = index;
-        return true;
-    },
-
-    activateSelected: function() {
-        if (this.selectionIndex < 0)
-            return;
-        let targetActor = this._grid.getItemAtIndex(this.selectionIndex);
-        targetActor._delegate.activate();
+    getFirstResult: function() {
+        if (this.getVisibleResultCount() > 0)
+            return this._grid.getItemAtIndex(0)._delegate;
+        else
+            return null;
     }
 });
 
@@ -182,8 +175,7 @@ const SearchResults = new Lang.Class({
 
     _init: function(searchSystem, openSearchSystem) {
         this._searchSystem = searchSystem;
-        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateCurrentResults));
-        this._searchSystem.connect('search-completed', Lang.bind(this, this._updateResults));
+        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateResults));
         this._openSearchSystem = openSearchSystem;
 
         this.actor = new St.BoxLayout({ name: 'searchResults',
@@ -215,13 +207,10 @@ const SearchResults = new Lang.Class({
 
         this._statusText = new St.Label({ style_class: 'search-statustext' });
         this._content.add(this._statusText);
-        this._selectedProvider = -1;
         this._providers = this._searchSystem.getProviders();
         this._providerMeta = [];
-        this._providerMetaResults = {};
         for (let i = 0; i < this._providers.length; i++) {
             this.createProviderMeta(this._providers[i]);
-            this._providerMetaResults[this.providers[i].title] = [];
         }
         this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
         this.actor.add(this._searchProvidersBox);
@@ -229,10 +218,12 @@ const SearchResults = new Lang.Class({
         this._openSearchProviders = [];
         this._openSearchSystem.connect('changed', Lang.bind(this, this._updateOpenSearchProviderButtons));
         this._updateOpenSearchProviderButtons();
+
+        this._highlightDefault = false;
+        this._defaultResult = null;
     },
 
     _updateOpenSearchProviderButtons: function() {
-        this._selectedOpenSearchButton = -1;
         for (let i = 0; i < this._openSearchProviders.length; i++)
             this._openSearchProviders[i].actor.destroy();
         this._openSearchProviders = this._openSearchSystem.getProviders();
@@ -240,18 +231,10 @@ const SearchResults = new Lang.Class({
             this._createOpenSearchProviderButton(this._openSearchProviders[i]);
     },
 
-    _updateOpenSearchButtonState: function() {
-         for (let i = 0; i < this._openSearchProviders.length; i++) {
-             if (i == this._selectedOpenSearchButton)
-                 this._openSearchProviders[i].actor.add_style_pseudo_class('selected');
-             else
-                 this._openSearchProviders[i].actor.remove_style_pseudo_class('selected');
-         }
-    },
-
     _createOpenSearchProviderButton: function(provider) {
         let button = new St.Button({ style_class: 'dash-search-button',
                                      reactive: true,
+                                     can_focus: true,
                                      x_fill: true,
                                      y_align: St.Align.MIDDLE });
         let bin = new St.Bin({ x_fill: false,
@@ -267,6 +250,17 @@ const SearchResults = new Lang.Class({
         button.set_child(bin);
         provider.actor = button;
 
+        button.setSelected = function(selected) {
+            if (selected)
+                button.add_style_pseudo_class('selected');
+            else
+                button.remove_style_pseudo_class('selected');
+        };
+        button.activate = Lang.bind(this, function() {
+            this._openSearchSystem.activateResult(provider.id);
+        });
+        button.actor = button;
+
         this._searchProvidersBox.add(button);
     },
 
@@ -305,8 +299,6 @@ const SearchResults = new Lang.Class({
     },
 
     _clearDisplay: function() {
-        this._selectedProvider = -1;
-        this._visibleResultsCount = 0;
         for (let i = 0; i < this._providerMeta.length; i++) {
             let meta = this._providerMeta[i];
             meta.resultDisplay.clear();
@@ -314,8 +306,8 @@ const SearchResults = new Lang.Class({
         }
     },
 
-    _clearDisplayForProvider: function(index) {
-        let meta = this._providerMeta[index];
+    _clearDisplayForProvider: function(provider) {
+        let meta = this._metaForProvider(provider);
         meta.resultDisplay.clear();
         meta.actor.hide();
     },
@@ -324,8 +316,6 @@ const SearchResults = new Lang.Class({
         this._searchSystem.reset();
         this._statusText.hide();
         this._clearDisplay();
-        this._selectedOpenSearchButton = -1;
-        this._updateOpenSearchButtonState();
     },
 
     startingSearch: function() {
@@ -336,147 +326,123 @@ const SearchResults = new Lang.Class({
 
     doSearch: function (searchString) {
         this._searchSystem.updateSearch(searchString);
+        let terms = this._searchSystem.getTerms();
+        this._openSearchSystem.setSearchTerms(terms);
     },
 
     _metaForProvider: function(provider) {
         return this._providerMeta[this._providers.indexOf(provider)];
     },
 
-    _updateCurrentResults: function(searchSystem, provider, results) {
-        let terms = searchSystem.getTerms();
-        let meta = this._metaForProvider(provider);
-        meta.resultDisplay.clear();
-        meta.actor.show();
-        meta.resultDisplay.renderResults(results, terms);
-        return true;
+    _maybeSetInitialSelection: function() {
+        let newDefaultResult = null;
+
+        for (let i = 0; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];
+
+            if (!meta.actor.visible)
+                continue;
+
+            let firstResult = meta.resultDisplay.getFirstResult();
+            if (firstResult) {
+                newDefaultResult = firstResult;
+                break; // select this one!
+            }
+        }
+
+        if (!newDefaultResult)
+            newDefaultResult = this._searchProvidersBox.get_first_child();
+
+        if (newDefaultResult != this._defaultResult) {
+            if (this._defaultResult)
+                this._defaultResult.setSelected(false);
+            if (newDefaultResult)
+                newDefaultResult.setSelected(this._highlightDefault);
+
+            this._defaultResult = newDefaultResult;
+        }
     },
 
-    _updateResults: function(searchSystem, results) {
-        if (results.length == 0) {
+    _updateStatusText: function () {
+        let haveResults = false;
+
+        for (let i = 0; i < this._providerMeta.length; ++i)
+            if (this._providerMeta[i].resultDisplay.getFirstResult()) {
+                haveResults = true;
+                break;
+            }
+
+        if (!haveResults) {
             this._statusText.set_text(_("No matching results."));
             this._statusText.show();
         } else {
-            this._selectedOpenSearchButton = -1;
-            this._updateOpenSearchButtonState();
             this._statusText.hide();
         }
+    },
 
+    _updateResults: function(searchSystem, results) {
         let terms = searchSystem.getTerms();
-        this._openSearchSystem.setSearchTerms(terms);
+        let [provider, providerResults] = results;
+        let meta = this._metaForProvider(provider);
 
-        // To avoid CSS transitions causing flickering
-        // of the selection when the first search result
-        // stays the same, we hide the content while
-        // filling in the results and setting the initial
-        // selection.
-        this._content.hide();
+        if (providerResults.length == 0) {
+            this._clearDisplayForProvider(provider);
+            meta.resultDisplay.setResults([], []);
+            this._maybeSetInitialSelection();
+            this._updateStatusText();
+        } else {
+            meta.resultDisplay.setResults(providerResults, terms);
+            let results = meta.resultDisplay.getResultsForDisplay();
 
-        for (let i = 0; i < results.length; i++) {
-            let [provider, providerResults] = results[i];
-            if (providerResults.length == 0) {
-                this._clearDisplayForProvider(i);
-            } else {
-                this._providerMetaResults[provider.title] = providerResults;
-                this._clearDisplayForProvider(i);
-                let meta = this._metaForProvider(provider);
+            provider.getResultMetas(results, Lang.bind(this, function(metas) {
+                this._clearDisplayForProvider(provider);
                 meta.actor.show();
-                meta.resultDisplay.renderResults(providerResults, terms);
-            }
-        }
 
-        if (this._selectedOpenSearchButton == -1)
-            this.selectDown(false);
+                // Hiding drops the key focus if we have it
+                let focus = global.stage.get_key_focus();
+                // To avoid CSS transitions causing flickering when
+                // the first search result stays the same, we hide the
+                // content while filling in the results.
+                this._content.hide();
 
-        this._content.show();
+                meta.resultDisplay.renderResults(metas);
+                this._maybeSetInitialSelection();
+                this._updateStatusText();
 
-        return true;
-    },
-
-    _modifyActorSelection: function(resultDisplay, up) {
-        let success;
-        let index = resultDisplay.getSelectionIndex();
-        if (up && index == -1)
-            index = resultDisplay.getVisibleResultCount() - 1;
-        else if (up)
-            index = index - 1;
-        else
-            index = index + 1;
-        return resultDisplay.selectIndex(index);
-    },
-
-    selectUp: function(recursing) {
-        if (this._selectedOpenSearchButton == -1) {
-            for (let i = this._selectedProvider; i >= 0; i--) {
-                let meta = this._providerMeta[i];
-                if (!meta.actor.visible)
-                    continue;
-                let success = this._modifyActorSelection(meta.resultDisplay, true);
-                if (success) {
-                    this._selectedProvider = i;
-                    return;
-                }
-            }
-        }
-
-        if (this._selectedOpenSearchButton == -1)
-            this._selectedOpenSearchButton = this._openSearchProviders.length;
-        this._selectedOpenSearchButton--;
-        this._updateOpenSearchButtonState();
-        if (this._selectedOpenSearchButton >= 0)
-            return;
-
-        if (this._providerMeta.length > 0 && !recursing) {
-            this._selectedProvider = this._providerMeta.length - 1;
-            this.selectUp(true);
+                this._content.show();
+                if (this._content.contains(focus))
+                    global.stage.set_key_focus(focus);
+            }));
         }
     },
 
-    selectDown: function(recursing) {
-        let current = this._selectedProvider;
-        if (this._selectedOpenSearchButton == -1) {
-            if (current == -1)
-                current = 0;
-            for (let i = current; i < this._providerMeta.length; i++) {
-                let meta = this._providerMeta[i];
-                if (!meta.actor.visible)
-                    continue;
-                 let success = this._modifyActorSelection(meta.resultDisplay, false);
-                 if (success) {
-                    this._selectedProvider = i;
-                    return;
-                 }
-            }
-        }
-        this._selectedOpenSearchButton++;
-
-        if (this._selectedOpenSearchButton < this._openSearchProviders.length) {
-            this._updateOpenSearchButtonState();
-            return;
-        }
-
-        this._selectedOpenSearchButton = -1;
-        this._updateOpenSearchButtonState();
-
-        if (this._providerMeta.length > 0 && !recursing) {
-            this._selectedProvider = 0;
-            this.selectDown(true);
-        }
+    activateDefault: function() {
+        if (this._defaultResult)
+            this._defaultResult.activate();
     },
 
-    activateSelected: function() {
-        if (this._selectedOpenSearchButton != -1) {
-            let provider = this._openSearchProviders[this._selectedOpenSearchButton];
-            this._openSearchSystem.activateResult(provider.id);
-            Main.overview.hide();
+    highlightDefault: function(highlight) {
+        this._highlightDefault = highlight;
+        if (this._defaultResult)
+            this._defaultResult.setSelected(highlight);
+    },
+
+    navigateFocus: function(direction) {
+        let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
+        if (direction == Gtk.DirectionType.TAB_BACKWARD ||
+            direction == (rtl ? Gtk.DirectionType.RIGHT
+                              : Gtk.DirectionType.LEFT) ||
+            direction == Gtk.DirectionType.UP) {
+            this.actor.navigate_focus(null, direction, false);
             return;
         }
 
-        let current = this._selectedProvider;
-        if (current < 0)
-            return;
-        let meta = this._providerMeta[current];
-        let resultDisplay = meta.resultDisplay;
-        resultDisplay.activateSelected();
-        Main.overview.hide();
+        let from = this._defaultResult ? this._defaultResult.actor : null;
+        this.actor.navigate_focus(from, direction, false);
+        if (this._defaultResult) {
+            // The default result appears focused, so navigate directly to the
+            // next result.
+            this.actor.navigate_focus(global.stage.key_focus, direction, false);
+        }
     }
 });

js/ui/sessionMode.js

@@ -0,0 +1,124 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+
+const Config = imports.misc.config;
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+
+
+const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
+    'a11y': imports.ui.status.accessibility.ATIndicator,
+    'volume': imports.ui.status.volume.Indicator,
+    'battery': imports.ui.status.power.Indicator,
+    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+    'userMenu': imports.ui.userMenu.UserMenuButton
+};
+
+if (Config.HAVE_BLUETOOTH)
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] =
+        imports.ui.status.bluetooth.Indicator;
+
+try {
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] =
+        imports.ui.status.network.NMApplet;
+} catch(e) {
+    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+}
+
+
+const DEFAULT_MODE = 'user';
+
+const _modes = {
+    'gdm': { hasOverview: false,
+             hasAppMenu: false,
+             showCalendarEvents: false,
+             allowSettings: false,
+             allowExtensions: false,
+             allowKeybindingsWhenModal: true,
+             hasRunDialog: false,
+             hasWorkspaces: false,
+             createSession: Main.createGDMSession,
+             extraStylesheet: global.datadir + '/theme/gdm.css',
+             statusArea: {
+                 order: [
+                     'a11y', 'display', 'keyboard',
+                     'volume', 'battery', 'powerMenu'
+                 ],
+                 implementation: {
+                     'a11y': imports.ui.status.accessibility.ATIndicator,
+                     'volume': imports.ui.status.volume.Indicator,
+                     'battery': imports.ui.status.power.Indicator,
+                     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+                     'powerMenu': imports.gdm.powerMenu.PowerMenuButton
+                 }
+             }
+           },
+
+    'initial-setup': { hasOverview: false,
+                       hasAppMenu: false,
+                       showCalendarEvents: false,
+                       allowSettings: false,
+                       allowExtensions: false,
+                       allowKeybindingsWhenModal: false,
+                       hasRunDialog: false,
+                       hasWorkspaces: false,
+                       createSession: Main.createInitialSetupSession,
+                       extraStylesheet: null,
+                       statusArea: {
+                           order: [
+                               'a11y', 'keyboard', 'volume'
+                           ],
+                           implementation: {
+                               'a11y': imports.ui.status.accessibility.ATIndicator,
+                               'keyboard': imports.ui.status.keyboard.XKBIndicator,
+                               'volume': imports.ui.status.volume.Indicator
+                        }
+                }
+           },
+
+    'user': { hasOverview: true,
+              hasAppMenu: true,
+              showCalendarEvents: true,
+              allowSettings: true,
+              allowExtensions: true,
+              allowKeybindingsWhenModal: false,
+              hasRunDialog: true,
+              hasWorkspaces: true,
+              createSession: Main.createUserSession,
+              extraStylesheet: null,
+              statusArea: {
+                  order: [
+                      'input-method', 'a11y', 'keyboard', 'volume', 'bluetooth',
+                      'network', 'battery', 'userMenu'
+                  ],
+                  implementation: STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION
+              }
+            }
+};
+
+function listModes() {
+    let modes = Object.getOwnPropertyNames(_modes);
+    for (let i = 0; i < modes.length; i++)
+        print(modes[i]);
+}
+
+const SessionMode = new Lang.Class({
+    Name: 'SessionMode',
+
+    _init: function() {
+        let params = _modes[global.session_mode];
+
+        params = Params.parse(params, _modes[DEFAULT_MODE]);
+
+        this._createSession = params.createSession;
+        delete params.createSession;
+
+        Lang.copyProperties(params, this);
+    },
+
+    createSession: function() {
+        if (this._createSession)
+            this._createSession();
+    }
+});

js/ui/shellDBus.js

@@ -3,9 +3,13 @@
 const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;
+const ExtensionDownloader = imports.ui.extensionDownloader;
+const ExtensionUtils = imports.misc.extensionUtils;
+const Flashspot = imports.ui.flashspot;
 const Main = imports.ui.main;
 
 const GnomeShellIface = <interface name="org.gnome.Shell">
@@ -30,32 +34,42 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
     <arg type="i" direction="in" name="y"/>
     <arg type="i" direction="in" name="width"/>
     <arg type="i" direction="in" name="height"/>
+    <arg type="b" direction="in" name="flash"/>
     <arg type="s" direction="in" name="filename"/>
     <arg type="b" direction="out" name="success"/>
 </method>
 <method name="ScreenshotWindow">
     <arg type="b" direction="in" name="include_frame"/>
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
     <arg type="s" direction="in" name="filename"/>
     <arg type="b" direction="out" name="success"/>
 </method>
 <method name="Screenshot">
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
     <arg type="s" direction="in" name="filename"/>
     <arg type="b" direction="out" name="success"/>
 </method>
-<method name="EnableExtension">
-    <arg type="s" direction="in" name="uuid"/>
-</method>
-<method name="DisableExtension">
-    <arg type="s" direction="in" name="uuid"/>
+<method name="FlashArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
 </method>
 <method name="InstallRemoteExtension">
     <arg type="s" direction="in" name="uuid"/>
-    <arg type="s" direction="in" name="version"/>
 </method>
 <method name="UninstallExtension">
     <arg type="s" direction="in" name="uuid"/>
     <arg type="b" direction="out" name="success"/>
 </method>
+<method name="LaunchExtensionPrefs">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
+<method name="ReloadExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
 <property name="OverviewActive" type="b" access="readwrite" />
 <property name="ApiVersion" type="i" access="read" />
 <property name="ShellVersion" type="s" access="read" />
@@ -109,12 +123,23 @@ const GnomeShell = new Lang.Class({
         return [success, returnValue];
     },
 
+    _onScreenshotComplete: function(obj, result, area, flash, invocation) {
+        if (flash) {
+            let flashspot = new Flashspot.Flashspot(area);
+            flashspot.fire();
+        }
+
+        let retval = GLib.Variant.new('(b)', [result]);
+        invocation.return_value(retval);
+    },
+
     /**
      * ScreenshotArea:
      * @x: The X coordinate of the area
      * @y: The Y coordinate of the area
      * @width: The width of the area
      * @height: The height of the area
+     * @flash: Whether to flash the area or not
      * @filename: The filename for the screenshot
      *
      * Takes a screenshot of the passed in area and saves it
@@ -122,13 +147,19 @@ const GnomeShell = new Lang.Class({
      * indicating whether the operation was successful or not.
      *
      */
-    ScreenshotAreaAsync : function (x, y, width, height, filename, callback) {
-        global.screenshot_area (x, y, width, height, filename, function (obj, result) { callback(result); });
+    ScreenshotAreaAsync : function (params, invocation) {
+        let [x, y, width, height, flash, filename, callback] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_area (x, y, width, height, filename,
+                                Lang.bind(this, this._onScreenshotComplete,
+                                          flash, invocation));
     },
 
     /**
      * ScreenshotWindow:
      * @include_frame: Whether to include the frame or not
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the window area or not
      * @filename: The filename for the screenshot
      *
      * Takes a screenshot of the focused window (optionally omitting the frame)
@@ -136,26 +167,41 @@ const GnomeShell = new Lang.Class({
      * indicating whether the operation was successful or not.
      *
      */
-    ScreenshotWindow : function (include_frame, filename) {
-        return global.screenshot_window (include_frame, filename);
+    ScreenshotWindowAsync : function (params, invocation) {
+        let [include_frame, include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_window (include_frame, include_cursor, filename,
+                                  Lang.bind(this, this._onScreenshotComplete,
+                                            flash, invocation));
     },
 
     /**
      * Screenshot:
      * @filename: The filename for the screenshot
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the screen or not
      *
      * Takes a screenshot of the whole screen and saves it
      * in @filename as png image, it returns a boolean
      * indicating whether the operation was successful or not.
      *
      */
-    ScreenshotAsync : function (filename, callback) {
-        global.screenshot(filename, function (obj, result) { callback(result); });
+    ScreenshotAsync : function (params, invocation) {
+        let [include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot(include_cursor, filename,
+                          Lang.bind(this, this._onScreenshotComplete,
+                                    flash, invocation));
+    },
+
+    FlashArea: function(x, y, width, height) {
+        let flashspot = new Flashspot.Flashspot({ x : x, y : y, width: width, height: height});
+        flashspot.fire();
     },
 
     ListExtensions: function() {
         let out = {};
-        for (let uuid in ExtensionSystem.extensionMeta) {
+        for (let uuid in ExtensionUtils.extensions) {
             let dbusObj = this.GetExtensionInfo(uuid);
             out[uuid] = dbusObj;
         }
@@ -163,10 +209,23 @@ const GnomeShell = new Lang.Class({
     },
 
     GetExtensionInfo: function(uuid) {
-        let meta = ExtensionSystem.extensionMeta[uuid] || {};
+        let extension = ExtensionUtils.extensions[uuid];
+        if (!extension)
+            return {};
+
+        let obj = {};
+        Lang.copyProperties(extension.metadata, obj);
+
+        // Only serialize the properties that we actually need.
+        const serializedProperties = ["type", "state", "path", "error", "hasPrefs"];
+
+        serializedProperties.forEach(function(prop) {
+            obj[prop] = extension[prop];
+        });
+
         let out = {};
-        for (let key in meta) {
-            let val = meta[key];
+        for (let key in obj) {
+            let val = obj[key];
             let type;
             switch (typeof val) {
             case 'string':
@@ -175,38 +234,47 @@ const GnomeShell = new Lang.Class({
             case 'number':
                 type = 'd';
                 break;
+            case 'boolean':
+                type = 'b';
+                break;
             default:
                 continue;
             }
             out[key] = GLib.Variant.new(type, val);
         }
+
         return out;
     },
 
     GetExtensionErrors: function(uuid) {
-        return ExtensionSystem.errors[uuid] || [];
+        let extension = ExtensionUtils.extensions[uuid];
+        if (!extension)
+            return [];
+
+        if (!extension.errors)
+            return [];
+
+        return extension.errors;
     },
 
-    EnableExtension: function(uuid) {
-        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);
-    },
-
-    DisableExtension: function(uuid) {
-        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
-        while (enabledExtensions.indexOf(uuid) != -1)
-            enabledExtensions.splice(enabledExtensions.indexOf(uuid), 1);
-        global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
-    },
-
-    InstallRemoteExtension: function(uuid, version_tag) {
-        ExtensionSystem.installExtensionFromUUID(uuid, version_tag);
+    InstallRemoteExtension: function(uuid) {
+        ExtensionDownloader.installExtensionFromUUID(uuid);
     },
 
     UninstallExtension: function(uuid) {
-        return ExtensionSystem.uninstallExtensionFromUUID(uuid);
+        return ExtensionDownloader.uninstallExtensionFromUUID(uuid);
+    },
+
+    LaunchExtensionPrefs: function(uuid) {
+        let appSys = Shell.AppSystem.get_default();
+        let app = appSys.lookup_app('gnome-shell-extension-prefs.desktop');
+        app.launch(global.display.get_current_time_roundtrip(),
+                   ['extension:///' + uuid], -1, null);
+    },
+
+    ReloadExtension: function(uuid) {
+        ExtensionSystem.unloadExtension(uuid);
+        ExtensionSystem.loadExtension(uuid);
     },
 
     get OverviewActive() {
@@ -220,8 +288,6 @@ const GnomeShell = new Lang.Class({
             Main.overview.hide();
     },
 
-    ApiVersion: ExtensionSystem.API_VERSION,
-
     ShellVersion: Config.PACKAGE_VERSION,
 
     _extensionStateChanged: function(_, newState) {

js/ui/shellMountOperation.js

@@ -1,17 +1,21 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
+const CheckBox = imports.ui.checkBox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const Params = imports.misc.params;
+const ShellEntry = imports.ui.shellEntry;
 
 const LIST_ITEM_ICON_SIZE = 48;
 
@@ -48,6 +52,11 @@ function _setLabelsForMessage(dialog, message) {
         _setLabelText(dialog.descriptionLabel, labels[1]);
 }
 
+function _createIcon(gicon) {
+    return new St.Icon({ gicon: gicon,
+                         style_class: 'shell-mount-operation-icon' })
+}
+
 /* -------------------------------------------------------- */
 
 const ListItem = new Lang.Class({
@@ -91,11 +100,11 @@ const ShellMountOperation = new Lang.Class({
     Name: 'ShellMountOperation',
 
     _init: function(source, params) {
-        params = Params.parse(params, { reaskPassword: false });
-
-        this._reaskPassword = params.reaskPassword;
+        params = Params.parse(params, { existingDialog: null });
 
         this._dialog = null;
+        this._dialogId = 0;
+        this._existingDialog = params.existingDialog;
         this._processesDialog = null;
 
         this.mountOp = new Shell.MountOperation();
@@ -107,99 +116,120 @@ const ShellMountOperation = new Lang.Class({
         this.mountOp.connect('show-processes-2',
                              Lang.bind(this, this._onShowProcesses2));
         this.mountOp.connect('aborted',
-                             Lang.bind(this, this._onAborted));
+                             Lang.bind(this, this.close));
 
-        this._icon = new St.Icon({ gicon: source.get_icon(),
-                                   style_class: 'shell-mount-operation-icon' });
+        this._gicon = source.get_icon();
+    },
+
+    _closeExistingDialog: function() {
+        if (!this._existingDialog)
+            return;
+
+        this._existingDialog.close();
+        this._existingDialog = null;
     },
 
     _onAskQuestion: function(op, message, choices) {
-        this._dialog = new ShellMountQuestionDialog(this._icon);
+        this._closeExistingDialog();
+        this._dialog = new ShellMountQuestionDialog(this._gicon);
 
-        this._dialog.connect('response',
-                               Lang.bind(this, function(object, choice) {
-                                   this.mountOp.set_choice(choice);
-                                   this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+        this._dialogId = this._dialog.connect('response', Lang.bind(this,
+            function(object, choice) {
+                this.mountOp.set_choice(choice);
+                this.mountOp.reply(Gio.MountOperationResult.HANDLED);
 
-                                   this._dialog.close(global.get_current_time());
-                                   this._dialog = null;
-                               }));
+                this.close();
+            }));
 
         this._dialog.update(message, choices);
-        this._dialog.open(global.get_current_time());
+        this._dialog.open();
     },
 
-    _onAskPassword: function(op, message) {
-        this._notificationShowing = true;
-        this._source = new ShellMountPasswordSource(message, this._icon, this._reaskPassword);
+    _onAskPassword: function(op, message, defaultUser, defaultDomain, flags) {
+        if (this._existingDialog) {
+            this._dialog = this._existingDialog;
+            this._dialog.reaskPassword();
+        } else {
+            this._dialog = new ShellMountPasswordDialog(message, this._gicon, flags);
+        }
 
-        this._source.connect('password-ready',
-                             Lang.bind(this, function(source, password) {
-                                 this.mountOp.set_password(password);
-                                 this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+        this._dialogId = this._dialog.connect('response', Lang.bind(this,
+            function(object, choice, password, remember) {
+                if (choice == -1) {
+                    this.mountOp.reply(Gio.MountOperationResult.ABORTED);
+                } else {
+                    if (remember)
+                        this.mountOp.set_password_save(Gio.PasswordSave.PERMANENTLY);
+                    else
+                        this.mountOp.set_password_save(Gio.PasswordSave.NEVER);
 
-                                 this._notificationShowing = false;
-                                 this._source.destroy();
-                             }));
-
-        this._source.connect('destroy',
-                             Lang.bind(this, function() {
-                                 if (!this._notificationShowing)
-                                     return;
-
-                                 this._notificationShowing = false;
-                                 this.mountOp.reply(Gio.MountOperationResult.ABORTED);
-                             }));
+                    this.mountOp.set_password(password);
+                    this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+                }
+            }));
+        this._dialog.open();
     },
 
-    _onAborted: function(op) {
-        if (!this._dialog)
-            return;
+    close: function(op) {
+        this._closeExistingDialog();
+        this._processesDialog = null;
 
-        this._dialog.close(global.get_current_time());
-        this._dialog = null;
+        if (this._dialog) {
+            this._dialog.close();
+            this._dialog = null;
+        }
     },
 
     _onShowProcesses2: function(op) {
+        this._closeExistingDialog();
+
         let processes = op.get_show_processes_pids();
         let choices = op.get_show_processes_choices();
         let message = op.get_show_processes_message();
 
         if (!this._processesDialog) {
-            this._processesDialog = new ShellProcessesDialog(this._icon);
+            this._processesDialog = new ShellProcessesDialog(this._gicon);
             this._dialog = this._processesDialog;
 
-            this._processesDialog.connect('response', 
-                                          Lang.bind(this, function(object, choice) {
-                                              if (choice == -1) {
-                                                  this.mountOp.reply(Gio.MountOperationResult.ABORTED);
-                                              } else {
-                                                  this.mountOp.set_choice(choice);
-                                                  this.mountOp.reply(Gio.MountOperationResult.HANDLED);
-                                              }
+            this._dialogId = this._processesDialog.connect('response', Lang.bind(this,
+                function(object, choice) {
+                    if (choice == -1) {
+                        this.mountOp.reply(Gio.MountOperationResult.ABORTED);
+                    } else {
+                        this.mountOp.set_choice(choice);
+                        this.mountOp.reply(Gio.MountOperationResult.HANDLED);
+                    }
 
-                                              this._processesDialog.close(global.get_current_time());
-                                              this._dialog = null;
-                                          }));
-            this._processesDialog.open(global.get_current_time());
+                    this.close();
+                }));
+            this._processesDialog.open();
         }
 
         this._processesDialog.update(message, processes, choices);
     },
+
+    borrowDialog: function() {
+        if (this._dialogId != 0) {
+            this._dialog.disconnect(this._dialogId);
+            this._dialogId = 0;
+        }
+
+        return this._dialog;
+    }
 });
 
 const ShellMountQuestionDialog = new Lang.Class({
     Name: 'ShellMountQuestionDialog',
     Extends: ModalDialog.ModalDialog,
 
-    _init: function(icon) {
+    _init: function(gicon) {
         this.parent({ styleClass: 'mount-question-dialog' });
 
         let mainContentLayout = new St.BoxLayout();
         this.contentLayout.add(mainContentLayout, { x_fill: true,
                                                     y_fill: false });
 
-        this._iconBin = new St.Bin({ child: icon });
+        this._iconBin = new St.Bin({ child: _createIcon(gicon) });
         mainContentLayout.add(this._iconBin,
                               { x_fill:  true,
                                 y_fill:  false,
@@ -211,6 +241,8 @@ const ShellMountQuestionDialog = new Lang.Class({
                               { y_align: St.Align.START });
 
         this.subjectLabel = new St.Label({ style_class: 'mount-question-dialog-subject' });
+        this.subjectLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this.subjectLabel.clutter_text.line_wrap = true;
 
         messageLayout.add(this.subjectLabel,
                           { y_fill:  false,
@@ -232,62 +264,107 @@ const ShellMountQuestionDialog = new Lang.Class({
 });
 Signals.addSignalMethods(ShellMountQuestionDialog.prototype);
 
-const ShellMountPasswordSource = new Lang.Class({
-    Name: 'ShellMountPasswordSource',
-    Extends: MessageTray.Source,
+const ShellMountPasswordDialog = new Lang.Class({
+    Name: 'ShellMountPasswordDialog',
+    Extends: ModalDialog.ModalDialog,
 
-    _init: function(message, icon, reaskPassword) {
+    _init: function(message, gicon, flags) {
         let strings = message.split('\n');
-        this.parent(strings[0]);
+        this.parent({ styleClass: 'prompt-dialog' });
 
-        this._notification = new ShellMountPasswordNotification(this, strings, icon, reaskPassword);
+        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
+                                                vertical: false });
+        this.contentLayout.add(mainContentBox);
 
-        // add ourselves as a source, and popup the notification
-        Main.messageTray.add(this);
-        this.notify(this._notification);
-    },
-});
-Signals.addSignalMethods(ShellMountPasswordSource.prototype);
+        let icon = _createIcon(gicon);
+        mainContentBox.add(icon,
+                           { x_fill:  true,
+                             y_fill:  false,
+                             x_align: St.Align.END,
+                             y_align: St.Align.START });
 
-const ShellMountPasswordNotification = new Lang.Class({
-    Name: 'ShellMountPasswordNotification',
-    Extends: MessageTray.Notification,
+        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 });
 
-    _init: function(source, strings, icon, reaskPassword) {
-        this.parent(source, strings[0], null, { customContent: true, icon: icon });
-
-        // set the notification to transient and urgent, so that it
-        // expands out
-        this.setTransient(true);
-        this.setUrgency(MessageTray.Urgency.CRITICAL);
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
+        this._messageBox.add(subject,
+                             { y_fill:  false,
+                               y_align: St.Align.START });
+        if (strings[0])
+            subject.set_text(strings[0]);
 
+        let description = new St.Label({ style_class: 'prompt-dialog-description' });
+        description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        description.clutter_text.line_wrap = true;
+        this._messageBox.add(description,
+                            { y_fill:  true,
+                              y_align: St.Align.START });
         if (strings[1])
-            this.addBody(strings[1]);
+            description.set_text(strings[1]);
 
-        if (reaskPassword) {
-            let label = new St.Label({ style_class: 'mount-password-reask',
-                                       text: _("Wrong password, please try again") });
+        this._passwordBox = new St.BoxLayout({ vertical: false });
+        this._messageBox.add(this._passwordBox);
 
-            this.addActor(label);
+        this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
+                                              text: _("Passphrase") }));
+        this._passwordBox.add(this._passwordLabel);
+
+        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._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+        this._passwordBox.add(this._passwordEntry, {expand: true });
+        this.setInitialKeyFocus(this._passwordEntry);
+
+        this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label',
+                                                 text: _("Sorry, that didn\'t work. Please try again.") });
+        this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._errorMessageLabel.clutter_text.line_wrap = true;
+        this._errorMessageLabel.hide();
+        this._messageBox.add(this._errorMessageLabel);
+
+        if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
+            this._rememberChoice = new CheckBox.CheckBox();
+            this._rememberChoice.getLabelActor().text = _("Remember Passphrase");
+            this._rememberChoice.actor.checked = true;
+            this._messageBox.add(this._rememberChoice.actor);
+        } else {
+            this._rememberChoice = null;
         }
 
-        this._responseEntry = new St.Entry({ style_class: 'mount-password-entry',
-                                             can_focus: true });
-        this.setActionArea(this._responseEntry);
+        let buttons = [{ label: _("Cancel"),
+                         action: Lang.bind(this, this._onCancelButton),
+                         key:    Clutter.Escape
+                       },
+                       { label: _("Unlock"),
+                         action: Lang.bind(this, this._onUnlockButton)
+                       }];
 
-        this._responseEntry.clutter_text.connect('activate',
-                                                 Lang.bind(this, this._onEntryActivated));
-        this._responseEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-
-        this._responseEntry.grab_key_focus();
+        this.setButtons(buttons);
     },
 
-    _onEntryActivated: function() {
-        let text = this._responseEntry.get_text();
-        if (text == '')
-            return;
+    reaskPassword: function() {
+        this._passwordEntry.set_text('');
+        this._errorMessageLabel.show();
+    },
 
-        this.source.emit('password-ready', text);
+    _onCancelButton: function() {
+        this.emit('response', -1, '', false);
+    },
+
+    _onUnlockButton: function() {
+        this._onEntryActivate();
+    },
+
+    _onEntryActivate: function() {
+        this.emit('response', 1,
+            this._passwordEntry.get_text(),
+            this._rememberChoice &&
+            this._rememberChoice.actor.checked);
     }
 });
 
@@ -295,14 +372,14 @@ const ShellProcessesDialog = new Lang.Class({
     Name: 'ShellProcessesDialog',
     Extends: ModalDialog.ModalDialog,
 
-    _init: function(icon) {
+    _init: function(gicon) {
         this.parent({ styleClass: 'show-processes-dialog' });
 
         let mainContentLayout = new St.BoxLayout();
         this.contentLayout.add(mainContentLayout, { x_fill: true,
                                                     y_fill: false });
 
-        this._iconBin = new St.Bin({ child: icon });
+        this._iconBin = new St.Bin({ child: _createIcon(gicon) });
         mainContentLayout.add(this._iconBin,
                               { x_fill:  true,
                                 y_fill:  false,
@@ -344,20 +421,20 @@ const ShellProcessesDialog = new Lang.Class({
 
         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();
                                       }));
     },
 
     _setAppsForPids: function(pids) {
         // remove all the items
-        this._applicationList.destroy_children();
+        this._applicationList.destroy_all_children();
 
         pids.forEach(Lang.bind(this, function(pid) {
             let tracker = Shell.WindowTracker.get_default();
@@ -384,3 +461,253 @@ const ShellProcessesDialog = new Lang.Class({
     }
 });
 Signals.addSignalMethods(ShellProcessesDialog.prototype);
+
+const GnomeShellMountOpIface = <interface name="org.Gtk.MountOperationHandler">
+<method name="AskPassword">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="s" direction="in" name="default_user"/>
+    <arg type="s" direction="in" name="default_domain"/>
+    <arg type="u" direction="in" name="flags"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="AskQuestion">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="as" direction="in" name="choices"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="ShowProcesses">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="ai" direction="in" name="application_pids"/>
+    <arg type="as" direction="in" name="choices"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="Close"/>
+</interface>;
+
+const ShellMountOperationType = {
+    NONE: 0,
+    ASK_PASSWORD: 1,
+    ASK_QUESTION: 2,
+    SHOW_PROCESSES: 3
+};
+
+const GnomeShellMountOpHandler = new Lang.Class({
+    Name: 'GnomeShellMountOpHandler',
+
+    _init: function() {
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellMountOpIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gtk/MountOperationHandler');
+        Gio.bus_own_name_on_connection(Gio.DBus.session, 'org.gtk.MountOperationHandler',
+                                       Gio.BusNameOwnerFlags.REPLACE, null, null);
+
+        this._dialog = null;
+        this._volumeMonitor = Gio.VolumeMonitor.get();
+
+        this._ensureEmptyRequest();
+    },
+
+    _ensureEmptyRequest: function() {
+        this._currentId = null;
+        this._currentInvocation = null;
+        this._currentType = ShellMountOperationType.NONE;
+    },
+
+    _clearCurrentRequest: function(response, details) {
+        if (this._currentInvocation) {
+            this._currentInvocation.return_value(
+                GLib.Variant.new('(ua{sv})', [response, details]));
+        }
+
+        this._ensureEmptyRequest();
+    },
+
+    _setCurrentRequest: function(invocation, id, type) {
+        let oldId = this._currentId;
+        let oldType = this._currentType;
+        let requestId = id + '@' + invocation.get_sender();
+
+        this._clearCurrentRequest(Gio.MountOperationResult.UNHANDLED, {});
+
+        this._currentInvocation = invocation;
+        this._currentId = requestId;
+        this._currentType = type;
+
+        if (this._dialog && (oldId == requestId) && (oldType == type))
+            return true;
+
+        return false;
+    },
+
+    _closeDialog: function() {
+        if (this._dialog) {
+            this._dialog.close();
+            this._dialog = null;
+        }
+    },
+
+    _createGIcon: function(iconName) {
+        let realIconName = iconName ? iconName : 'drive-harddisk';
+        return new Gio.ThemedIcon({ name: realIconName,
+                                    use_default_fallbacks: true });
+    },
+
+    /**
+     * AskPassword:
+     * @id: an opaque ID identifying the object for which the operation is requested
+     *      The ID must be unique in the context of the calling process.
+     * @message: the message to display
+     * @icon_name: the name of an icon to display
+     * @default_user: the default username for display
+     * @default_domain: the default domain for display
+     * @flags: a set of GAskPasswordFlags
+     * @response: a GMountOperationResult
+     * @response_details: a dictionary containing the response details as
+     * entered by the user. The dictionary MAY contain the following properties:
+     *   - "password" -> (s): a password to be used to complete the mount operation
+     *   - "password_save" -> (u): a GPasswordSave
+     *
+     * The dialog will stay visible until clients call the Close() method, or
+     * another dialog becomes visible.
+     * Calling AskPassword again for the same id will have the effect to clear
+     * the existing dialog and update it with a message indicating the previous
+     * attempt went wrong.
+     */
+    AskPasswordAsync: function(params, invocation) {
+        let [id, message, iconName, defaultUser, defaultDomain, flags] = params;
+
+        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.ASK_PASSWORD)) {
+            this._dialog.reaskPassword();
+            return;
+        }
+
+        this._closeDialog();
+
+        this._dialog = new ShellMountPasswordDialog(message, this._createGIcon(iconName), flags);
+        this._dialog.connect('response', Lang.bind(this,
+            function(object, choice, password, remember) {
+                let details = {};
+                let response;
+
+                if (choice == -1) {
+                    response = Gio.MountOperationResult.ABORTED;
+                } else {
+                    response = Gio.MountOperationResult.HANDLED;
+
+                    let passSave = remember ? Gio.PasswordSave.PERMANENTLY : Gio.PasswordSave.NEVER;
+                    details['password_save'] = GLib.Variant.new('u', passSave);
+                    details['password'] = GLib.Variant.new('s', password);
+                }
+
+                this._clearCurrentRequest(response, details);
+            }));
+        this._dialog.open();
+    },
+
+    /**
+     * AskQuestion:
+     * @id: an opaque ID identifying the object for which the operation is requested
+     *      The ID must be unique in the context of the calling process.
+     * @message: the message to display
+     * @icon_name: the name of an icon to display
+     * @choices: an array of choice strings
+     * GetResponse:
+     * @response: a GMountOperationResult
+     * @response_details: a dictionary containing the response details as
+     * entered by the user. The dictionary MAY contain the following properties:
+     *   - "choice" -> (i): the chosen answer among the array of strings passed in
+     *
+     * The dialog will stay visible until clients call the Close() method, or
+     * another dialog becomes visible.
+     * Calling AskQuestion again for the same id will have the effect to clear
+     * update the dialog with the new question.
+     */
+    AskQuestionAsync: function(params, invocation) {
+        let [id, message, iconName, choices] = params;
+
+        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.ASK_QUESTION)) {
+            this._dialog.update(message, choices);
+            return;
+        }
+
+        this._closeDialog();
+
+        this._dialog = new ShellMountQuestionDialog(this._createGIcon(iconName), message);
+        this._dialog.connect('response', Lang.bind(this,
+            function(object, choice) {
+                this._clearCurrentRequest(Gio.MountOperationResult.HANDLED,
+                                          { choice: GLib.Variant.new('i', choice) });
+            }));
+
+        this._dialog.update(message, choices);
+        this._dialog.open();
+    },
+
+    /**
+     * ShowProcesses:
+     * @id: an opaque ID identifying the object for which the operation is requested
+     *      The ID must be unique in the context of the calling process.
+     * @message: the message to display
+     * @icon_name: the name of an icon to display
+     * @application_pids: the PIDs of the applications to display
+     * @choices: an array of choice strings
+     * @response: a GMountOperationResult
+     * @response_details: a dictionary containing the response details as
+     * entered by the user. The dictionary MAY contain the following properties:
+     *   - "choice" -> (i): the chosen answer among the array of strings passed in
+     *
+     * The dialog will stay visible until clients call the Close() method, or
+     * another dialog becomes visible.
+     * Calling ShowProcesses again for the same id will have the effect to clear
+     * the existing dialog and update it with the new message and the new list
+     * of processes.
+     */
+    ShowProcessesAsync: function(params, invocation) {
+        let [id, message, iconName, applicationPids, choices] = params;
+
+        if (this._setCurrentRequest(invocation, id, ShellMountOperationType.SHOW_PROCESSES)) {
+            this._dialog.update(message, applicationPids, choices);
+            return;
+        }
+
+        this._closeDialog();
+
+        this._dialog = new ShellProcessesDialog(this._createGIcon(iconName));
+        this._dialog.connect('response', Lang.bind(this,
+            function(object, choice) {
+                let response;
+                let details = {};
+
+                if (choice == -1) {
+                    response = Gio.MountOperationResult.ABORTED;
+                } else {
+                    response = Gio.MountOperationResult.HANDLED;
+                    details['choice'] = GLib.Variant.new('i', choice);
+                }
+
+                this._clearCurrentRequest(response, details);
+            }));
+
+        this._dialog.update(message, applicationPids, choices);
+        this._dialog.open();
+    },
+
+    /**
+     * Close:
+     *
+     * Closes a dialog previously opened by AskPassword, AskQuestion or ShowProcesses.
+     * If no dialog is open, does nothing.
+     */
+    Close: function(params, invocation) {
+        this._clearCurrentRequest(Gio.MountOperationResult.UNHANDLED, {});
+        this._closeDialog();
+    }
+});

js/ui/status/accessibility.js

@@ -44,7 +44,7 @@ const ATIndicator = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('preferences-desktop-accessibility', null);
+        this.parent('preferences-desktop-accessibility', _("Accessibility"));
 
         let highContrast = this._buildHCItem();
         this.menu.addMenuItem(highContrast);
@@ -56,9 +56,9 @@ const ATIndicator = new Lang.Class({
         let textZoom = this._buildFontItem();
         this.menu.addMenuItem(textZoom);
 
-//        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
-//                                                               'screen-reader-enabled');
-//        this.menu.addMenuItem(screenReader);
+        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
+                                                               'screen-reader-enabled');
+        this.menu.addMenuItem(screenReader);
 
         let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
                                                                    'screen-keyboard-enabled');

js/ui/status/bluetooth.js

@@ -28,7 +28,7 @@ const Indicator = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('bluetooth-disabled', null);
+        this.parent('bluetooth-disabled', _("Bluetooth"));
 
         this._applet = new GnomeBluetoothApplet.Applet();
 
@@ -106,10 +106,7 @@ const Indicator = new Lang.Class({
             /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
             this._killswitch.setStatus(_("hardware disabled"));
 
-        if (has_adapter)
-            this.actor.show();
-        else
-            this.actor.hide();
+        this.actor.visible = has_adapter;
 
         if (on) {
             this._discoverable.actor.show();
@@ -181,7 +178,7 @@ const Indicator = new Lang.Class({
 
         // update connected property
         if (device.can_connect)
-            item._connectedMenuitem.setToggleState(device.connected);
+            item._connectedMenuItem.setToggleState(device.connected);
     },
 
     _createDeviceItem: function(device) {
@@ -308,7 +305,7 @@ const Indicator = new Lang.Class({
 
     _ensureSource: function() {
         if (!this._source) {
-            this._source = new Source();
+            this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active', St.IconType.SYMBOLIC);
             Main.messageTray.add(this._source);
         }
     },
@@ -333,35 +330,6 @@ const Indicator = new Lang.Class({
     }
 });
 
-const Source = new Lang.Class({
-    Name: 'BluetoothSource',
-    Extends: MessageTray.Source,
-
-    _init: function() {
-        this.parent(_("Bluetooth"));
-
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    notify: function(notification) {
-        this._private_destroyId = notification.connect('destroy', Lang.bind(this, function(notification) {
-            if (this.notification == notification) {
-                // the destroyed notification is the last for this source
-                this.notification.disconnect(this._private_destroyId);
-                this.destroy();
-            }
-        }));
-
-        this.parent(notification);
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: 'bluetooth-active',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
-    }
-});
-
 const AuthNotification = new Lang.Class({
     Name: 'AuthNotification',
     Extends: MessageTray.Notification,
@@ -412,7 +380,7 @@ const ConfirmNotification = new Lang.Class({
         this._applet = applet;
         this._devicePath = device_path;
         this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the PIN '%s' matches the one on the device.").format(pin));
+        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));
 
         this.addButton('matches', _("Matches"));
         this.addButton('does-not-match', _("Does not match"));
@@ -448,7 +416,8 @@ const PinNotification = new Lang.Class({
         this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
             let key = event.get_key_symbol();
             if (key == Clutter.KEY_Return) {
-                this.emit('action-invoked', 'ok');
+                if (this._canActivateOkButton())
+                    this.emit('action-invoked', 'ok');
                 return true;
             } else if (key == Clutter.KEY_Escape) {
                 this.emit('action-invoked', 'cancel');
@@ -461,6 +430,12 @@ const PinNotification = new Lang.Class({
         this.addButton('ok', _("OK"));
         this.addButton('cancel', _("Cancel"));
 
+        this.setButtonSensitive('ok', this._canActivateOkButton());
+        this._entry.clutter_text.connect('text-changed', Lang.bind(this,
+            function() {
+                this.setButtonSensitive('ok', this._canActivateOkButton());
+            }));
+
         this.connect('action-invoked', Lang.bind(this, function(self, action) {
             if (action == 'ok') {
                 if (this._numeric) {
@@ -483,6 +458,11 @@ const PinNotification = new Lang.Class({
         }));
     },
 
+    _canActivateOkButton: function() {
+        // PINs have a fixed length of 6
+        return this._entry.clutter_text.text.length == 6;
+    },
+
     grabFocus: function(lockTray) {
         this.parent(lockTray);
         global.stage.set_key_focus(this._entry);

js/ui/status/keyboard.js

@@ -2,9 +2,9 @@
 
 const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gkbd = imports.gi.Gkbd;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
@@ -14,34 +14,32 @@ const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const Util = imports.misc.util;
 
+const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
+const KEY_CURRENT_INPUT_SOURCE = 'current';
+const KEY_INPUT_SOURCES = 'sources';
+
+const INPUT_SOURCE_TYPE_XKB = 'xkb';
+
 const LayoutMenuItem = new Lang.Class({
     Name: 'LayoutMenuItem',
     Extends: PopupMenu.PopupBaseMenuItem,
 
-    _init: function(config, id, indicator, long_name) {
+    _init: function(displayName, shortName) {
         this.parent();
 
-        this._config = config;
-        this._id = id;
-        this.label = new St.Label({ text: long_name });
-        this.indicator = indicator;
+        this.label = new St.Label({ text: displayName });
+        this.indicator = new St.Label({ text: shortName });
         this.addActor(this.label);
         this.addActor(this.indicator);
-    },
-
-    activate: function(event) {
-        this.parent(event);
-
-        this._config.lock_group(this._id);
     }
 });
 
-const XKBIndicator = new Lang.Class({
-    Name: 'XKBIndicator',
+const InputSourceIndicator = new Lang.Class({
+    Name: 'InputSourceIndicator',
     Extends: PanelMenu.Button,
 
     _init: function() {
-        this.parent(0.0);
+        this.parent(0.0, _("Keyboard"));
 
         this._container = new Shell.GenericContainer();
         this._container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
@@ -50,122 +48,144 @@ const XKBIndicator = new Lang.Class({
         this.actor.add_actor(this._container);
         this.actor.add_style_class_name('panel-status-button');
 
-        this._iconActor = new St.Icon({ icon_name: 'keyboard', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
-        this._container.add_actor(this._iconActor);
-        this._labelActors = [ ];
-        this._layoutItems = [ ];
+        this._labelActors = {};
+        this._layoutItems = {};
 
-        this._showFlags = false;
-        this._config = Gkbd.Configuration.get();
-        this._config.connect('changed', Lang.bind(this, this._syncConfig));
-        this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
-        this._config.start_listen();
+        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
+        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
+        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
 
-        this._syncConfig();
+        this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        this._xkbInfo = new GnomeDesktop.XkbInfo();
 
-        if (global.session_type == Shell.SessionType.USER) {
+        this._inputSourcesChanged();
+
+        // re-using "allowSettings" for the keyboard layout is a bit shady,
+        // but at least for now it is used as "allow popping up windows
+        // from shell menus"; we can always add a separate sessionMode
+        // option if need arises.
+        if (Main.sessionMode.allowSettings) {
             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
-                Main.overview.hide();
-                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-            }));
+            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
         }
         this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
     },
 
-    _adjustGroupNames: function(names) {
-        // Disambiguate duplicate names with a subscript
-        // This is O(N^2) to avoid sorting names
-        // but N <= 4 so who cares?
+    _currentInputSourceChanged: function() {
+        let nVisibleSources = Object.keys(this._layoutItems).length;
+        if (nVisibleSources < 2)
+            return;
 
-        for (let i = 0; i < names.length; i++) {
-            let name = names[i];
-            let cnt = 0;
-            for (let j = i + 1; j < names.length; j++) {
-                if (names[j] == name) {
-                    cnt++;
-                    // U+2081 SUBSCRIPT ONE
-                    names[j] = name + String.fromCharCode(0x2081 + cnt);
-                }
-            }
-            if (cnt != 0)
-                names[i] = name + '\u2081';
+        let nSources = this._settings.get_value(KEY_INPUT_SOURCES).n_children();
+        let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        if (newCurrentSourceIndex >= nSources)
+            return;
+
+        if (!this._layoutItems[newCurrentSourceIndex]) {
+            // This source index is invalid as we weren't able to
+            // build a menu item for it, so we hide ourselves since we
+            // can't fix it here. *shrug*
+            this.menu.close();
+            this.actor.hide();
+            return;
+        } else {
+            this.actor.show();
         }
 
-        return names;
+        if (this._layoutItems[this._currentSourceIndex]) {
+            this._layoutItems[this._currentSourceIndex].setShowDot(false);
+            this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
+        }
+
+        this._layoutItems[newCurrentSourceIndex].setShowDot(true);
+        this._container.set_skip_paint(this._labelActors[newCurrentSourceIndex], false);
+
+        this._currentSourceIndex = newCurrentSourceIndex;
     },
 
-    _syncConfig: function() {
-        this._showFlags = this._config.if_flags_shown();
-        if (this._showFlags) {
-            this._container.set_skip_paint(this._iconActor, false);
-        } else {
-            this._container.set_skip_paint(this._iconActor, true);
+    _inputSourcesChanged: function() {
+        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
+        let nSources = sources.n_children();
+
+        for (let i in this._layoutItems)
+            this._layoutItems[i].destroy();
+
+        for (let i in this._labelActors)
+            this._labelActors[i].destroy();
+
+        this._layoutItems = {};
+        this._labelActors = {};
+
+        let infos = [];
+        let infosByShortName = {};
+
+        for (let i = 0; i < nSources; i++) {
+            let [type, id] = sources.get_child_value(i).deep_unpack();
+            if (type != INPUT_SOURCE_TYPE_XKB)
+                continue;
+
+            let info = {};
+            [info.exists, info.displayName, info.shortName, , ] =
+                this._xkbInfo.get_layout_info(id);
+
+            if (!info.exists)
+                continue;
+
+            info.sourceIndex = i;
+
+            if (!(info.shortName in infosByShortName))
+                infosByShortName[info.shortName] = [];
+            infosByShortName[info.shortName].push(info);
+            infos.push(info);
         }
 
-        let groups = this._config.get_group_names();
-        if (groups.length > 1) {
+        if (infos.length > 1) {
             this.actor.show();
         } else {
             this.menu.close();
             this.actor.hide();
         }
 
-        for (let i = 0; i < this._layoutItems.length; i++)
-            this._layoutItems[i].destroy();
+        for (let i = 0; i < infos.length; i++) {
+            let info = infos[i];
+            if (infosByShortName[info.shortName].length > 1) {
+                let sub = infosByShortName[info.shortName].indexOf(info) + 1;
+                info.shortName += String.fromCharCode(0x2080 + sub);
+            }
 
-        for (let i = 0; i < this._labelActors.length; i++)
-            this._labelActors[i].destroy();
-
-        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
-
-        this._selectedLayout = null;
-        this._layoutItems = [ ];
-        this._selectedLabel = null;
-        this._labelActors = [ ];
-        for (let i = 0; i < groups.length; i++) {
-            let icon_name = this._config.get_group_name(i);
-            let actor;
-            if (this._showFlags)
-                actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.SYMBOLIC, style_class: 'popup-menu-icon' });
-            else
-                actor = new St.Label({ text: short_names[i] });
-            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
-            item._short_group_name = short_names[i];
-            item._icon_name = icon_name;
-            this._layoutItems.push(item);
+            let item = new LayoutMenuItem(info.displayName, info.shortName);
+            this._layoutItems[info.sourceIndex] = item;
             this.menu.addMenuItem(item, i);
+            item.connect('activate', Lang.bind(this, function() {
+                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
+                                         GLib.Variant.new_uint32(info.sourceIndex));
+            }));
 
-            let shortLabel = new St.Label({ text: short_names[i] });
-            this._labelActors.push(shortLabel);
+            let shortLabel = new St.Label({ text: info.shortName });
+            this._labelActors[info.sourceIndex] = shortLabel;
             this._container.add_actor(shortLabel);
             this._container.set_skip_paint(shortLabel, true);
         }
 
-        this._syncGroup();
+        this._currentInputSourceChanged();
     },
 
-    _syncGroup: function() {
-        let selected = this._config.get_current_group();
+    _showLayout: function() {
+        Main.overview.hide();
 
-        if (this._selectedLayout) {
-            this._selectedLayout.setShowDot(false);
-            this._selectedLayout = null;
-        }
+        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
+        let current = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        let id = sources.get_child_value(current).deep_unpack()[1];
+        let [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(id);
 
-        if (this._selectedLabel) {
-            this._container.set_skip_paint(this._selectedLabel, true);
-            this._selectedLabel = null;
-        }
+        if (!xkbLayout || xkbLayout.length == 0)
+            return;
 
-        let item = this._layoutItems[selected];
-        item.setShowDot(true);
+        let description = xkbLayout;
+        if (xkbVariant.length > 0)
+            description = description + '\t' + xkbVariant;
 
-        this._iconActor.icon_name = item._icon_name;
-        this._selectedLabel = this._labelActors[selected];
-        this._container.set_skip_paint(this._selectedLabel, this._showFlags);
-
-        this._selectedLayout = item;
+        Util.spawn(['gkbd-keyboard-display', '-l', description]);
     },
 
     _containerGetPreferredWidth: function(container, for_height, alloc) {
@@ -173,15 +193,11 @@ const XKBIndicator = new Lang.Class({
         // for the height of all children, but we ignore the results
         // for those we don't actually display.
         let max_min_width = 0, max_natural_width = 0;
-        if (this._showFlags)
-            [max_min_width, max_natural_width] = this._iconActor.get_preferred_width(for_height);
 
-        for (let i = 0; i < this._labelActors.length; i++) {
+        for (let i in this._labelActors) {
             let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
-            if (!this._showFlags) {
-                max_min_width = Math.max(max_min_width, min_width);
-                max_natural_width = Math.max(max_natural_width, natural_width);
-            }
+            max_min_width = Math.max(max_min_width, min_width);
+            max_natural_width = Math.max(max_natural_width, natural_width);
         }
 
         alloc.min_size = max_min_width;
@@ -190,15 +206,11 @@ const XKBIndicator = new Lang.Class({
 
     _containerGetPreferredHeight: function(container, for_width, alloc) {
         let max_min_height = 0, max_natural_height = 0;
-        if (this._showFlags)
-            [max_min_height, max_natural_height] = this._iconActor.get_preferred_height(for_width);
-        
-        for (let i = 0; i < this._labelActors.length; i++) {
+
+        for (let i in this._labelActors) {
             let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
-            if (!this._showFlags) {
-                max_min_height = Math.max(max_min_height, min_height);
-                max_natural_height = Math.max(max_natural_height, natural_height);
-            }
+            max_min_height = Math.max(max_min_height, min_height);
+            max_natural_height = Math.max(max_natural_height, natural_height);
         }
 
         alloc.min_size = max_min_height;
@@ -212,8 +224,7 @@ const XKBIndicator = new Lang.Class({
         box.y2 -= box.y1;
         box.y1 = 0;
 
-        this._iconActor.allocate_align_fill(box, 0.5, 0, false, false, flags);
-        for (let i = 0; i < this._labelActors.length; i++)
+        for (let i in this._labelActors)
             this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
     }
 });

js/ui/status/network.js

@@ -101,11 +101,10 @@ const NMNetworkMenuItem = new Lang.Class({
     Name: 'NMNetworkMenuItem',
     Extends: PopupMenu.PopupBaseMenuItem,
 
-    _init: function(accessPoints, title, params) {
+    _init: function(bestAP, title, params) {
         this.parent(params);
 
-        accessPoints = sortAccessPoints(accessPoints);
-        this.bestAP = accessPoints[0];
+        this.bestAP = bestAP;
 
         if (!title) {
             let ssid = this.bestAP.get_ssid();
@@ -113,6 +112,7 @@ const NMNetworkMenuItem = new Lang.Class({
         }
 
         this._label = new St.Label({ text: title });
+        this.actor.label_actor = this._label;
         this.addActor(this._label);
         this._icons = new St.BoxLayout({ style_class: 'nm-menu-item-icons' });
         this.addActor(this._icons, { align: St.Align.END });
@@ -126,24 +126,10 @@ const NMNetworkMenuItem = new Lang.Class({
             this.bestAP._secType != NMAccessPointSecurity.NONE)
             this._secureIcon.icon_name = 'network-wireless-encrypted';
         this._icons.add_actor(this._secureIcon);
-
-        this._accessPoints = [ ];
-        for (let i = 0; i < accessPoints.length; i++) {
-            let ap = accessPoints[i];
-            // need a wrapper object here, because the access points can be shared
-            // between many NMNetworkMenuItems
-            let apObj = {
-                ap: ap,
-                updateId: ap.connect('notify::strength', Lang.bind(this, this._updated))
-            };
-            this._accessPoints.push(apObj);
-        }
     },
 
-    _updated: function(ap) {
-        if (ap.strength > this.bestAP.strength)
-            this.bestAP = ap;
-
+    updateBestAP: function(ap) {
+        this.bestAP = ap;
         this._signalIcon.icon_name = this._getIcon();
     },
 
@@ -152,36 +138,6 @@ const NMNetworkMenuItem = new Lang.Class({
             return 'network-workgroup';
         else
             return 'network-wireless-signal-' + signalToIcon(this.bestAP.strength);
-    },
-
-    updateAccessPoints: function(accessPoints) {
-        for (let i = 0; i < this._accessPoints.length; i++) {
-            let apObj = this._accessPoints[i];
-            apObj.ap.disconnect(apObj.updateId);
-            apObj.updateId = 0;
-        }
-
-        accessPoints = sortAccessPoints(accessPoints);
-        this.bestAP = accessPoints[0];
-        this._accessPoints = [ ];
-        for (let i = 0; i < accessPoints; i++) {
-            let ap = accessPoints[i];
-            let apObj = {
-                ap: ap,
-                updateId: ap.connect('notify::strength', Lang.bind(this, this._updated))
-            };
-            this._accessPoints.push(apObj);
-        }
-    },
-
-    destroy: function() {
-        for (let i = 0; i < this._accessPoints.length; i++) {
-            let apObj = this._accessPoints[i];
-            apObj.ap.disconnect(apObj.updateId);
-            apObj.updateId = 0;
-        }
-
-        this.parent();
     }
 });
 
@@ -296,16 +252,17 @@ const NMDevice = new Lang.Class({
         this._client = client;
         this._connections = [ ];
         for (let i = 0; i < connections.length; i++) {
-            if (!connections[i]._uuid)
+            if (!connections[i].get_uuid())
                 continue;
             if (!this.connectionValid(connections[i]))
                 continue;
             // record the connection
             let obj = {
                 connection: connections[i],
-                name: connections[i]._name,
-                uuid: connections[i]._uuid,
+                name: connections[i].get_id(),
+                uuid: connections[i].get_uuid(),
                 timestamp: connections[i]._timestamp,
+                item: null,
             };
             this._connections.push(obj);
         }
@@ -400,48 +357,46 @@ const NMDevice = new Lang.Class({
     },
 
     checkConnection: function(connection) {
-        let pos = this._findConnection(connection._uuid);
+        let pos = this._findConnection(connection.get_uuid());
         let exists = pos != -1;
         let valid = this.connectionValid(connection);
+        let similar = false;
+        if (exists) {
+            let existing = this._connections[pos];
 
-        if (exists && !valid)
-            this.removeConnection(connection);
-        else if (!exists && valid)
-            this.addConnection(connection);
-        else if (exists && valid) {
-            // propagate changes and update the UI
-
-            if (this._connections[pos].timestamp != connection._timestamp) {
-                this._connections[pos].timestamp = connection._timestamp;
-                this._connections.sort(this._connectionSortFunction);
-
-                this._clearSection();
-                this._queueCreateSection();
-            }
+            // Check if connection changed name or id
+            similar = existing.name == connection.get_id() &&
+                existing.timestamp == connection._timestamp;
         }
+
+        if (exists && valid && similar) {
+            // Nothing to do
+            return;
+        }
+
+        if (exists)
+            this.removeConnection(connection);
+        if (valid)
+            this.addConnection(connection);
     },
 
     addConnection: function(connection) {
         // record the connection
         let obj = {
             connection: connection,
-            name: connection._name,
-            uuid: connection._uuid,
+            name: connection.get_id(),
+            uuid: connection.get_uuid(),
             timestamp: connection._timestamp,
+            item: null,
         };
-        this._connections.push(obj);
-        this._connections.sort(this._connectionSortFunction);
+        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
 
         this._clearSection();
         this._queueCreateSection();
     },
 
     removeConnection: function(connection) {
-        if (!connection._uuid) {
-            log('Cannot remove a connection without an UUID');
-            return;
-        }
-        let pos = this._findConnection(connection._uuid);
+        let pos = this._findConnection(connection.get_uuid());
         if (pos == -1) {
             // this connection was never added, nothing to do here
             return;
@@ -613,7 +568,7 @@ const NMDevice = new Lang.Class({
         let title;
         let active = this._activeConnection._connection;
         if (active) {
-            title = active._name;
+            title = active.get_id();
         } else {
             /* TRANSLATORS: this is the indication that a connection for another logged in user is active,
                and we cannot access its settings (including the name) */
@@ -706,18 +661,15 @@ const NMDeviceWired = new Lang.Class({
         // the device
         // we can do it here because addConnection and removeConnection
         // both call _createSection at some point
-        if (this._connections.length <= 1)
-            this.section.actor.hide();
-        else
-            this.section.actor.show();
+        this.section.actor.visible = this._connections.length > 1;
     },
 
     _createAutomaticConnection: function() {
         let connection = new NetworkManager.Connection();
-        connection._uuid = NetworkManager.utils_uuid_generate();
+        let uuid = NetworkManager.utils_uuid_generate();
         connection.add_setting(new NetworkManager.SettingWired());
         connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: connection._uuid,
+            uuid: uuid,
             id: this._autoConnectionName,
             type: NetworkManager.SETTING_WIRED_SETTING_NAME,
             autoconnect: true
@@ -861,10 +813,10 @@ const NMDeviceBluetooth = new Lang.Class({
 
     _createAutomaticConnection: function() {
         let connection = new NetworkManager.Connection;
-        connection._uuid = NetworkManager.utils_uuid_generate();
+        let uuid = NetworkManager.utils_uuid_generate();
         connection.add_setting(new NetworkManager.SettingBluetooth);
         connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: connection._uuid,
+            uuid: uuid,
             id: this._autoConnectionName,
             type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
             autoconnect: false
@@ -899,12 +851,12 @@ const NMDeviceVPN = new Lang.Class({
     Name: 'NMDeviceVPN',
     Extends: NMDevice,
 
-    _init: function(client) {
+    _init: function(client, device, connections) {
         // Disable autoconnections
         this._autoConnectionName = null;
         this.category = NMConnectionCategory.VPN;
 
-        this.parent(client, null, [ ]);
+        this.parent(client, null, connections);
     },
 
     connectionValid: function(connection) {
@@ -916,13 +868,24 @@ const NMDeviceVPN = new Lang.Class({
     },
 
     get connected() {
-        return !!this._activeConnection;
+        if (!this._activeConnection)
+            return false;
+
+        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
     },
 
     setActiveConnection: function(activeConnection) {
+        if (this._stateChangeId)
+            this._activeConnection.disconnect(this._stateChangeId);
+        this._stateChangeId = 0;
+
         this.parent(activeConnection);
 
-        this.emit('active-connection-changed');
+        if (this._activeConnection)
+            this._stateChangeId = this._activeConnection.connect('vpn-state-changed',
+                                                                 Lang.bind(this, this._connectionStateChanged));
+
+        this.emit('state-changed');
     },
 
     _shouldShowConnectionList: function() {
@@ -935,7 +898,39 @@ const NMDeviceVPN = new Lang.Class({
     },
 
     getStatusLabel: function() {
-        return null;
+        if (!this._activeConnection) // Same as DISCONNECTED
+            return null;
+
+        switch(this._activeConnection.vpn_state) {
+        case NetworkManager.VPNConnectionState.DISCONNECTED:
+        case NetworkManager.VPNConnectionState.ACTIVATED:
+            return null;
+        case NetworkManager.VPNConnectionState.PREPARE:
+        case NetworkManager.VPNConnectionState.CONNECT:
+        case NetworkManager.VPNConnectionState.IP_CONFIG_GET:
+            return _("connecting...");
+        case NetworkManager.VPNConnectionState.NEED_AUTH:
+            /* Translators: this is for network connections that require some kind of key or password */
+            return _("authentication required");
+        case NetworkManager.VPNConnectionState.FAILED:
+            return _("connection failed");
+        default:
+            log('VPN connection state invalid, is %d'.format(this.device.state));
+            return 'invalid';
+        }
+    },
+
+    _connectionStateChanged: function(connection, newstate, reason) {
+        if (newstate == NetworkManager.VPNConnectionState.FAILED) {
+            // FIXME: if we ever want to show something based on reason,
+            // we need to convert from NetworkManager.VPNConnectionStateReason
+            // to NetworkManager.DeviceStateReason
+            this.emit('activation-failed', reason);
+        }
+
+        // Differently from real NMDevices, there is no need to queue
+        // an update of the menu section, contents wouldn't change anyway
+        this.emit('state-changed');
     }
 });
 
@@ -986,6 +981,7 @@ const NMDeviceWireless = new Lang.Class({
                 obj.ssidText = ssidToLabel(obj.ssid);
                 this._networks.push(obj);
             }
+            ap._updateId = ap.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));
 
             // Check if some connection is valid for this AP
             for (let j = 0; j < validConnections.length; j++) {
@@ -997,6 +993,10 @@ const NMDeviceWireless = new Lang.Class({
             }
         }
 
+        // Sort APs within each network by strength
+        for (let i = 0; i < this._networks.length; i++)
+            sortAccessPoints(this._networks[i].accessPoints);
+
         if (this.device.active_access_point) {
             let networkPos = this._findNetwork(this.device.active_access_point);
 
@@ -1037,13 +1037,8 @@ const NMDeviceWireless = new Lang.Class({
     },
 
     setEnabled: function(enabled) {
-        if (enabled) {
-            this.statusItem.actor.show();
-            this.section.actor.show();
-        } else {
-            this.statusItem.actor.hide();
-            this.section.actor.hide();
-        }
+        this.statusItem.actor.visible = enabled;
+        this.section.actor.visible = enabled;
     },
 
     activate: function() {
@@ -1084,7 +1079,7 @@ const NMDeviceWireless = new Lang.Class({
         // the user toggles the switch and has more than one wireless device)
         if (this._networks.length > 0) {
             let connection = this._createAutomaticConnection(this._networks[0]);
-            let accessPoints = sortAccessPoints(this._networks[0].accessPoints);
+            let accessPoints = this._networks[0].accessPoints;
             this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null);
         }
     },
@@ -1154,6 +1149,13 @@ const NMDeviceWireless = new Lang.Class({
         else if (!oneHasConnection && twoHasConnection)
             return 1;
 
+        let oneStrength = one.accessPoints[0].strength;
+        let twoStrength = two.accessPoints[0].strength;
+
+        // place stronger connections first
+        if (oneStrength != twoStrength)
+            return oneStrength < twoStrength ? 1 : -1;
+
         let oneHasSecurity = one.security != NMAccessPointSecurity.NONE;
         let twoHasSecurity = two.security != NMAccessPointSecurity.NONE;
 
@@ -1203,6 +1205,28 @@ const NMDeviceWireless = new Lang.Class({
         return -1;
     },
 
+    _onApStrengthChanged: function(ap) {
+        let res = this._findExistingNetwork(ap);
+        if (res == null) {
+            // Uhm... stale signal?
+            return;
+        }
+
+        let network = this._networks[res.network];
+        network.accessPoints.splice(res.ap, 1);
+        Util.insertSorted(network.accessPoints, ap, function(one, two) {
+            return two.strength - one.strength;
+        });
+
+        this._networks.splice(res.network, 1);
+        let newPos = Util.insertSorted(this._networks, network, Lang.bind(this, this._networkSortFunction));
+
+        if (newPos != res.network) {
+            this._clearSection();
+            this._queueCreateSection();
+        }
+    },
+
     _accessPointAdded: function(device, accessPoint) {
         if (accessPoint.get_ssid() == null) {
             // This access point is not visible yet
@@ -1222,9 +1246,11 @@ const NMDeviceWireless = new Lang.Class({
                 return;
             }
 
-            apObj.accessPoints.push(accessPoint);
+            Util.insertSorted(apObj.accessPoints, accessPoint, function(one, two) {
+                return two.strength - one.strength;
+            });
             if (apObj.item)
-                apObj.item.updateAccessPoints(apObj.accessPoints);
+                apObj.item.updateBestAP(apObj.accessPoints[0]);
         } else {
             apObj = { ssid: accessPoint.get_ssid(),
                       mode: accessPoint.mode,
@@ -1235,6 +1261,7 @@ const NMDeviceWireless = new Lang.Class({
                     };
             apObj.ssidText = ssidToLabel(apObj.ssid);
         }
+        accessPoint._updateId = accessPoint.connect('notify::strength', Lang.bind(this, this._onApStrengthChanged));
 
         // check if this enables new connections for this group
         for (let i = 0; i < this._connections.length; i++) {
@@ -1242,23 +1269,26 @@ const NMDeviceWireless = new Lang.Class({
             if (accessPoint.connection_valid(connection) &&
                 apObj.connections.indexOf(connection) == -1) {
                 apObj.connections.push(connection);
-
-                // this potentially changes the order
-                needsupdate = true;
             }
         }
 
-        if (pos == -1 || needsupdate) {
-            if (pos != -1)
-                this._networks.splice(pos, 1);
-            pos = Util.insertSorted(this._networks, apObj, this._networkSortFunction);
+        if (pos != -1)
+            this._networks.splice(pos, 1);
+        let newPos = Util.insertSorted(this._networks, apObj, this._networkSortFunction);
 
+        // Queue an update of the UI if we changed the order
+        if (newPos != pos) {
             this._clearSection();
             this._queueCreateSection();
         }
     },
 
     _accessPointRemoved: function(device, accessPoint) {
+        if (accessPoint._updateId) {
+            accessPoint.disconnect(accessPoint._updateId);
+            accessPoint._updateId = 0;
+        }
+
         let res = this._findExistingNetwork(accessPoint);
 
         if (res == null) {
@@ -1300,17 +1330,30 @@ const NMDeviceWireless = new Lang.Class({
                     this._overflowItem = null;
                 }
             }
-            this._networks.splice(res.network, 1);
 
-        } else if (apObj.item)
-            apObj.item.updateAccessPoints(apObj.accessPoints);
+            this._networks.splice(res.network, 1);
+        } else {
+            let okPrev = true, okNext = true;
+
+            if (res.network > 0)
+                okPrev = this._networkSortFunction(this._networks[res.network - 1], apObj) >= 0;
+            if (res.network < this._networks.length-1)
+                okNext = this._networkSortFunction(this._networks[res.network + 1], apObj) <= 0;
+
+            if (!okPrev || !okNext) {
+                this._clearSection();
+                this._queueCreateSection();
+            } else if (apObj.item) {
+                apObj.item.updateBestAP(apObj.accessPoints[0]);
+            }
+        }
     },
 
     _createAPItem: function(connection, accessPointObj, useConnectionName) {
-        let item = new NMNetworkMenuItem(accessPointObj.accessPoints, useConnectionName ? connection._name : undefined);
+        let item = new NMNetworkMenuItem(accessPointObj.accessPoints[0], useConnectionName ? connection.get_id() : undefined);
         item._connection = connection;
         item.connect('activate', Lang.bind(this, function() {
-            let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
+            let accessPoints = accessPointObj.accessPoints;
             for (let i = 0; i < accessPoints.length; i++) {
                 if (accessPoints[i].connection_valid(connection)) {
                     this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
@@ -1330,9 +1373,7 @@ const NMDeviceWireless = new Lang.Class({
     },
 
     removeConnection: function(connection) {
-        if (!connection._uuid)
-            return;
-        let pos = this._findConnection(connection._uuid);
+        let pos = this._findConnection(connection.get_uuid());
         if (pos == -1) {
             // removing connection that was never added
             return;
@@ -1346,7 +1387,7 @@ const NMDeviceWireless = new Lang.Class({
             let apObj = this._networks[i];
             let connections = apObj.connections;
             for (let k = 0; k < connections.length; k++) {
-                if (connections[k]._uuid == connection._uuid) {
+                if (connections[k].get_uuid() == connection.get_uuid()) {
                     // remove the connection from the access point group
                     connections.splice(k);
                     forceupdate = forceupdate || connections.length == 0;
@@ -1362,7 +1403,7 @@ const NMDeviceWireless = new Lang.Class({
                                 forceupdate = true;
                             } else {
                                 for (let j = 0; j < items.length; j++) {
-                                    if (items[j]._connection._uuid == connection._uuid) {
+                                    if (items[j]._connection.get_uuid() == connection.get_uuid()) {
                                         items[j].destroy();
                                         break;
                                     }
@@ -1389,8 +1430,8 @@ const NMDeviceWireless = new Lang.Class({
         // record the connection
         let obj = {
             connection: connection,
-            name: connection._name,
-            uuid: connection._uuid,
+            name: connection.get_id(),
+            uuid: connection.get_uuid(),
         };
         this._connections.push(obj);
 
@@ -1419,27 +1460,19 @@ const NMDeviceWireless = new Lang.Class({
     },
 
     _createActiveConnectionItem: function() {
-        let icon, title;
-        if (this._activeConnection && this._activeConnection._connection) {
-            let connection = this._activeConnection._connection;
-            if (this._activeNetwork)
-                this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
-                                                                   { reactive: false });
-            else
-                this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(connection._name,
-                                                                              'network-wireless-connected',
-                                                                              { reactive: false });
-        } else {
-            // We cannot read the connection (due to ACL, or API incompatibility), but we still show signal if we have it
-            let menuItem;
-            if (this._activeNetwork)
-                this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
-                                                                   { reactive: false });
-            else
-                this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(_("Connected (private)"),
-                                                                              'network-wireless-connected',
-                                                                              { reactive: false });
-        }
+        let title;
+        if (this._activeConnection && this._activeConnection._connection)
+            title = this._activeConnection._connection.get_id();
+        else
+            title = _("Connected (private)");
+
+        if (this._activeNetwork)
+            this._activeConnectionItem = new NMNetworkMenuItem(this.device.active_access_point, undefined,
+                                                               { reactive: false });
+        else
+            this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(title,
+                                                                          'network-wireless-connected',
+                                                                          { reactive: false });
         this._activeConnectionItem.setShowDot(true);
     },
 
@@ -1479,9 +1512,9 @@ const NMDeviceWireless = new Lang.Class({
                     apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
             }
         } else {
-            apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
+            apObj.item = new NMNetworkMenuItem(apObj.accessPoints[0]);
             apObj.item.connect('activate', Lang.bind(this, function() {
-                let accessPoints = sortAccessPoints(apObj.accessPoints);
+                let accessPoints = apObj.accessPoints;
                 if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
                     || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                     // 802.1x-enabled APs require further configuration, so they're
@@ -1534,10 +1567,25 @@ const NMDeviceWireless = new Lang.Class({
 
 const NMApplet = new Lang.Class({
     Name: 'NMApplet',
-    Extends: PanelMenu.SystemStatusButton,
+    Extends: PanelMenu.Button,
 
     _init: function() {
-        this.parent('network-error', null);
+        this.parent(0.0, _('Network'));
+
+        this._box = new St.BoxLayout({ name: 'networkMenu' });
+        this.actor.add_actor (this._box);
+        this.actor.add_style_class_name('panel-status-button');
+
+        this._primaryIcon = new St.Icon({ icon_name: 'network-offline',
+                                          icon_type: St.IconType.SYMBOLIC,
+                                          style_class: 'system-status-icon' });
+        this._box.add_actor(this._primaryIcon);
+
+        this._secondaryIcon = new St.Icon({ icon_name: 'network-vpn',
+                                            icon_type: St.IconType.SYMBOLIC,
+                                            style_class: 'system-status-icon',
+                                            visible: false });
+        this._box.add_actor(this._secondaryIcon);
 
         this._client = NMClient.Client.new();
 
@@ -1551,6 +1599,16 @@ const NMApplet = new Lang.Class({
         this.menu.addMenuItem(this._statusSection);
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
+        this._activeConnections = [ ];
+        this._connections = [ ];
+
+        this._mainConnection = null;
+        this._vpnConnection = null;
+        this._activeAccessPointUpdateId = 0;
+        this._activeAccessPoint = null;
+        this._mobileUpdateId = 0;
+        this._mobileUpdateDevice = null;
+
         this._devices = { };
 
         this._devices.wired = {
@@ -1586,13 +1644,9 @@ const NMApplet = new Lang.Class({
 
         this._devices.vpn = {
             section: new PopupMenu.PopupMenuSection(),
-            device: new NMDeviceVPN(this._client),
+            device: this._makeWrapperDevice(NMDeviceVPN, null),
             item: new NMWiredSectionTitleMenuItem(_("VPN Connections"))
         };
-        this._devices.vpn.device.connect('active-connection-changed', Lang.bind(this, function() {
-            this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
-        }));
-        this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
         this._devices.vpn.section.addMenuItem(this._devices.vpn.item);
         this._devices.vpn.section.addMenuItem(this._devices.vpn.device.section);
         this._devices.vpn.section.actor.hide();
@@ -1600,15 +1654,6 @@ const NMApplet = new Lang.Class({
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
 
-        this._activeConnections = [ ];
-        this._connections = [ ];
-
-        this._mainConnection = null;
-        this._activeAccessPointUpdateId = 0;
-        this._activeAccessPoint = null;
-        this._mobileUpdateId = 0;
-        this._mobileUpdateDevice = null;
-
         // Device types
         this._dtypes = { };
         this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
@@ -1649,9 +1694,16 @@ const NMApplet = new Lang.Class({
         }));
     },
 
+    setIcon: function(iconName) {
+        this._primaryIcon.icon_name = iconName;
+    },
+
     _ensureSource: function() {
         if (!this._source) {
-            this._source = new NMMessageTraySource();
+            this._source = new MessageTray.Source(_("Network Manager"),
+                                                  'network-transmit-receive',
+                                                  St.IconType.SYMBOLIC);
+
             this._source.connect('destroy', Lang.bind(this, function() {
                 this._source = null;
             }));
@@ -1672,6 +1724,18 @@ const NMApplet = new Lang.Class({
     },
 
     _syncSectionTitle: function(category) {
+        if (category == NMConnectionCategory.VPN) {
+            // Special case VPN: it's only one device (and a fake one
+            // actually), and we don't show it if empty
+            let device = this._devices.vpn.device;
+            let section = this._devices.vpn.section;
+            let item = this._devices.vpn.item;
+
+            section.actor.visible = !device.empty;
+            item.updateForDevice(device);
+            return;
+        }
+
         let devices = this._devices[category].devices;
         let item = this._devices[category].item;
         let section = this._devices[category].section;
@@ -1722,6 +1786,29 @@ const NMApplet = new Lang.Class({
         this._source.notify(device._notification);
     },
 
+    _makeWrapperDevice: function(wrapperClass, device) {
+        let wrapper = new wrapperClass(this._client, device, this._connections);
+
+        wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
+            // XXX: nm-applet has no special text depending on reason
+            // but I'm not sure of this generic message
+            this._notifyForDevice(device, 'network-error',
+                                  _("Connection failed"),
+                                  _("Activation of network connection failed"),
+                                  MessageTray.Urgency.HIGH);
+        }));
+        wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
+            this._syncSectionTitle(dev.category);
+        }));
+        wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
+            wrapper.disconnect(wrapper._activationFailedId);
+            wrapper.disconnect(wrapper._deviceStateChangedId);
+            wrapper.disconnect(wrapper._destroyId);
+        });
+
+        return wrapper;
+    },
+
     _deviceAdded: function(client, device) {
         if (device._delegate) {
             // already seen, not adding again
@@ -1729,24 +1816,8 @@ const NMApplet = new Lang.Class({
         }
         let wrapperClass = this._dtypes[device.get_device_type()];
         if (wrapperClass) {
-            let wrapper = new wrapperClass(this._client, device, this._connections);
+            let wrapper = this._makeWrapperDevice(wrapperClass, device);
 
-            wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
-                // XXX: nm-applet has no special text depending on reason
-                // but I'm not sure of this generic message
-                this._notifyForDevice(device, 'network-error',
-                                      _("Connection failed"),
-                                      _("Activation of network connection failed"),
-                                     MessageTray.Urgency.HIGH);
-            }));
-            wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
-                this._syncSectionTitle(dev.category);
-            }));
-            wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
-                wrapper.disconnect(wrapper._activationFailedId);
-                wrapper.disconnect(wrapper._deviceStateChangedId);
-                wrapper.disconnect(wrapper._destroyId);
-            });
             let section = this._devices[wrapper.category].section;
             let devices = this._devices[wrapper.category].devices;
 
@@ -1800,9 +1871,12 @@ const NMApplet = new Lang.Class({
 
         this._activeConnections = newActiveConnections;
         this._mainConnection = null;
+        this._vpnConnection = null;
+
         let activating = null;
         let default_ip4 = null;
         let default_ip6 = null;
+        let active_vpn = null;
         for (let i = 0; i < this._activeConnections.length; i++) {
             let a = this._activeConnections[i];
 
@@ -1833,14 +1907,16 @@ const NMApplet = new Lang.Class({
             if (a.default6)
                 default_ip6 = a;
 
-            if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            if (a._type == 'vpn')
+                active_vpn = a;
+            else if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING)
                 activating = a;
 
             if (!a._primaryDevice) {
                 if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
                     // find a good device to be considered primary
                     a._primaryDevice = null;
-                    let devices = a.get_devices();
+                    let devices = a.get_devices() || [];
                     for (let j = 0; j < devices.length; j++) {
                         let d = devices[j];
                         if (d._delegate) {
@@ -1863,6 +1939,7 @@ const NMApplet = new Lang.Class({
         }
 
         this._mainConnection = activating || default_ip4 || default_ip6 || this._activeConnections[0] || null;
+        this._vpnConnection = active_vpn;
     },
 
     _notifyActivated: function(activeConnection) {
@@ -1879,7 +1956,7 @@ const NMApplet = new Lang.Class({
         let connections = this._settings.list_connections();
         for (let i = 0; i < connections.length; i++) {
             let connection = connections[i];
-            if (connection._uuid) {
+            if (connection._updatedId) {
                 // connection was already seen (for example because NetworkManager was restarted)
                 continue;
             }
@@ -1892,7 +1969,7 @@ const NMApplet = new Lang.Class({
     },
 
     _newConnection: function(settings, connection) {
-        if (connection._uuid) {
+        if (connection._updatedId) {
             // connection was already seen
             return;
         }
@@ -1915,35 +1992,31 @@ const NMApplet = new Lang.Class({
 
         if (section == NMConnectionCategory.VPN) {
             this._devices.vpn.device.removeConnection(connection);
-            if (this._devices.vpn.device.empty)
-                this._devices.vpn.section.actor.hide();
+            this._syncSectionTitle(section);
         } else if (section != NMConnectionCategory.INVALID) {
             let devices = this._devices[section].devices;
             for (let i = 0; i < devices.length; i++)
                 devices[i].removeConnection(connection);
         }
 
-        connection._uuid = null;
         connection.disconnect(connection._removedId);
         connection.disconnect(connection._updatedId);
+        connection._removedId = connection._updatedId = 0;
     },
 
     _updateConnection: function(connection) {
         let connectionSettings = connection.get_setting_by_name(NetworkManager.SETTING_CONNECTION_SETTING_NAME);
         connection._type = connectionSettings.type;
-
         connection._section = this._ctypes[connection._type] || NMConnectionCategory.INVALID;
-        connection._name = connectionSettings.id;
-        connection._uuid = connectionSettings.uuid;
         connection._timestamp = connectionSettings.timestamp;
 
         let section = connection._section;
 
-        if (connection._section == NMConnectionCategory.INVALID)
+        if (section == NMConnectionCategory.INVALID)
             return;
         if (section == NMConnectionCategory.VPN) {
             this._devices.vpn.device.checkConnection(connection);
-            this._devices.vpn.section.actor.show();
+            this._syncSectionTitle(section);
         } else {
             let devices = this._devices[section].devices;
             for (let i = 0; i < devices.length; i++) {
@@ -1966,12 +2039,10 @@ const NMApplet = new Lang.Class({
 
         this._statusSection.actor.hide();
 
-        this._syncSectionTitle('wired');
-        this._syncSectionTitle('wireless');
-        this._syncSectionTitle('wwan');
-
-        if (!this._devices.vpn.device.empty)
-            this._devices.vpn.section.actor.show();
+        this._syncSectionTitle(NMConnectionCategory.WIRED);
+        this._syncSectionTitle(NMConnectionCategory.WIRELESS);
+        this._syncSectionTitle(NMConnectionCategory.WWAN);
+        this._syncSectionTitle(NMConnectionCategory.VPN);
     },
 
     _syncNMState: function() {
@@ -2014,9 +2085,6 @@ const NMApplet = new Lang.Class({
             case NMConnectionCategory.WIRED:
                 this.setIcon('network-wired-acquiring');
                 break;
-            case NMConnectionCategory.VPN:
-                this.setIcon('network-vpn-acquiring');
-                break;
             default:
                 // fallback to a generic connected icon
                 // (it could be a private connection of some other user)
@@ -2079,9 +2147,6 @@ const NMApplet = new Lang.Class({
                 this.setIcon('network-cellular-signal-' + signalToIcon(dev.mobileDevice.signal_quality));
                 hasMobileIcon = true;
                 break;
-            case NMConnectionCategory.VPN:
-                this.setIcon('network-vpn');
-                break;
             default:
                 // fallback to a generic connected icon
                 // (it could be a private connection of some other user)
@@ -2090,6 +2155,25 @@ const NMApplet = new Lang.Class({
             }
         }
 
+        // update VPN indicator
+        if (this._vpnConnection) {
+            let vpnIconName = 'network-vpn';
+            if (this._vpnConnection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+                vpnIconName = 'network-vpn-acquiring';
+
+            // only show a separate icon when we're using a wireless/3g connection
+            if (mc._section == NMConnectionCategory.WIRELESS || 
+                mc._section == NMConnectionCategory.WWAN) {
+                this._secondaryIcon.icon_name = vpnIconName;
+                this._secondaryIcon.visible = true;
+            } else {
+                this.setIcon(vpnIconName);
+                this._secondaryIcon.visible = false;
+            }
+        } else {
+            this._secondaryIcon.visible = false;
+        }
+
         // cleanup stale signal connections
 
         if (!hasApIcon && this._activeAccessPointUpdateId) {
@@ -2104,18 +2188,3 @@ const NMApplet = new Lang.Class({
         }
     }
 });
-
-const NMMessageTraySource = new Lang.Class({
-    Name: 'NMMessageTraySource',
-    Extends: MessageTray.Source,
-
-    _init: function() {
-        this.parent(_("Network Manager"));
-
-        let icon = new St.Icon({ icon_name: 'network-transmit-receive',
-                                 icon_type: St.IconType.SYMBOLIC,
-                                 icon_size: this.ICON_SIZE
-                               });
-        this._setSummaryIcon(icon);
-    }
-});

js/ui/status/power.js

@@ -46,7 +46,6 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
 <method name="GetPrimaryDevice">
     <arg type="(susdut)" direction="out" />
 </method>
-<signal name="Changed" />
 <property name="Icon" type="s" access="read" />
 </interface>;
 
@@ -57,7 +56,7 @@ const Indicator = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('battery-missing', null);
+        this.parent('battery-missing', _("Battery"));
 
         this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
 
@@ -76,7 +75,8 @@ const Indicator = new Lang.Class({
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
 
-        this._proxy.connectSignal('Changed', Lang.bind(this, this._devicesChanged));
+        this._proxy.connect('g-properties-changed',
+                            Lang.bind(this, this._devicesChanged));
         this._devicesChanged();
     },
 
@@ -212,7 +212,7 @@ const DeviceItem = new Lang.Class({
         case UPDeviceType.COMPUTER:
             return _("Computer");
         default:
-            return _("Unknown");
+            return C_("device", "Unknown");
         }
     }
 });

js/ui/status/volume.js

@@ -22,7 +22,7 @@ const Indicator = new Lang.Class({
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('audio-volume-muted', null);
+        this.parent('audio-volume-muted', _("Volume"));
 
         this._control = new Gvc.MixerControl({ name: 'GNOME Shell Volume Control' });
         this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
@@ -35,6 +35,7 @@ const Indicator = new Lang.Class({
         this._output = null;
         this._outputVolumeId = 0;
         this._outputMutedId = 0;
+        /* Translators: This is the label for audio volume */
         this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
         this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
         this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
@@ -148,13 +149,9 @@ const Indicator = new Lang.Class({
                 }
             }
         }
-        if (showInput) {
-            this._inputTitle.actor.show();
-            this._inputSlider.actor.show();
-        } else {
-            this._inputTitle.actor.hide();
-            this._inputSlider.actor.hide();
-        }
+
+        this._inputTitle.actor.visible = showInput;
+        this._inputSlider.actor.visible = showInput;
     },
 
     _volumeToIcon: function(volume) {

js/ui/telepathyClient.js

@@ -33,15 +33,6 @@ const NotificationDirection = {
     RECEIVED: 'chat-received'
 };
 
-let contactFeatures = [Tp.ContactFeature.ALIAS,
-                        Tp.ContactFeature.AVATAR_DATA,
-                        Tp.ContactFeature.PRESENCE];
-
-// This is GNOME Shell's implementation of the Telepathy 'Client'
-// interface. Specifically, the shell is a Telepathy 'Observer', which
-// lets us see messages even if they belong to another app (eg,
-// Empathy).
-
 function makeMessageFromTpMessage(tpMessage, direction) {
     let [text, flags] = tpMessage.to_text();
 
@@ -83,11 +74,21 @@ const Client = new Lang.Class({
         // account path -> AccountNotification
         this._accountNotifications = {};
 
+        // Define features we want
+        this._accountManager = Tp.AccountManager.dup();
+        let factory = this._accountManager.get_factory();
+        factory.add_account_features([Tp.Account.get_feature_quark_connection()]);
+        factory.add_connection_features([Tp.Connection.get_feature_quark_contact_list()]);
+        factory.add_channel_features([Tp.Channel.get_feature_quark_contacts()]);
+        factory.add_contact_features([Tp.ContactFeature.ALIAS,
+                                      Tp.ContactFeature.AVATAR_DATA,
+                                      Tp.ContactFeature.PRESENCE,
+                                      Tp.ContactFeature.SUBSCRIPTION_STATES]);
+
         // Set up a SimpleObserver, which will call _observeChannels whenever a
         // channel matching its filters is detected.
         // The second argument, recover, means _observeChannels will be run
         // for any existing channel as well.
-        this._accountManager = Tp.AccountManager.dup();
         this._tpClient = new Shell.TpClient({ 'account-manager': this._accountManager,
                                               'name': 'GnomeShell',
                                               'uniquify-name': true })
@@ -114,16 +115,9 @@ const Client = new Lang.Class({
             throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
         }
 
-
         // Watch subscription requests and connection errors
         this._subscriptionSource = null;
         this._accountSource = null;
-        let factory = this._accountManager.get_factory();
-        factory.add_account_features([Tp.Account.get_feature_quark_connection()]);
-        factory.add_connection_features([Tp.Connection.get_feature_quark_contact_list()]);
-        factory.add_contact_features([Tp.ContactFeature.SUBSCRIPTION_STATES,
-                                      Tp.ContactFeature.ALIAS,
-                                      Tp.ContactFeature.AVATAR_DATA]);
 
         this._accountManager.connect('account-validity-changed',
             Lang.bind(this, this._accountValidityChanged));
@@ -133,42 +127,20 @@ const Client = new Lang.Class({
 
     _observeChannels: function(observer, account, conn, channels,
                                dispatchOp, requests, context) {
-        // If the self_contact doesn't have the ALIAS, make sure
-        // to fetch it before trying to grab the channels.
-        let self_contact = conn.get_self_contact();
-        if (self_contact.has_feature(Tp.ContactFeature.ALIAS)) {
-            this._finishObserveChannels(account, conn, channels, context);
-        } else {
-            Shell.get_self_contact_features(conn,
-                                            contactFeatures,
-                                            Lang.bind(this, function() {
-                                                this._finishObserveChannels(account, conn, channels, context);
-                                            }));
-            context.delay();
-        }
-    },
-
-    _finishObserveChannels: function(account, conn, channels, context) {
         let len = channels.length;
         for (let i = 0; i < len; i++) {
             let channel = channels[i];
             let [targetHandle, targetHandleType] = channel.get_handle();
 
+            if (Shell.is_channel_invalidated(channel))
+              continue;
+
             /* Only observe contact text channels */
             if ((!(channel instanceof Tp.TextChannel)) ||
                targetHandleType != Tp.HandleType.CONTACT)
                continue;
 
-            /* Request a TpContact */
-            Shell.get_tp_contacts(conn, [targetHandle],
-                    contactFeatures,
-                    Lang.bind(this,  function (connection, contacts, failed) {
-                        if (contacts.length < 1)
-                            return;
-
-                        /* We got the TpContact */
-                        this._createChatSource(account, conn, channel, contacts[0]);
-                    }), null);
+            this._createChatSource(account, conn, channel, channel.get_target_contact());
         }
 
         context.accept();
@@ -212,6 +184,9 @@ const Client = new Lang.Class({
                 continue;
             }
 
+            if (Shell.is_channel_invalidated(channel))
+              continue;
+
             // 'notify' will be true when coming from an actual HandleChannels
             // call, and not when from a successful Claim call. The point is
             // we don't want to notify for a channel we just claimed which
@@ -234,41 +209,25 @@ const Client = new Lang.Class({
 
     _displayRoomInvitation: function(conn, channel, dispatchOp, context) {
         // We can only approve the rooms if we have been invited to it
-        let selfHandle = channel.group_get_self_handle();
-        if (selfHandle == 0) {
+        let selfContact = channel.group_get_self_contact();
+        if (selfContact == null) {
             Shell.decline_dispatch_op(context, 'Not invited to the room');
             return;
         }
 
-        let [invited, inviter, reason, msg] = channel.group_get_local_pending_info(selfHandle);
+        let [invited, inviter, reason, msg] = channel.group_get_local_pending_contact_info(selfContact);
         if (!invited) {
             Shell.decline_dispatch_op(context, 'Not invited to the room');
             return;
         }
 
-        // Request a TpContact for the inviter
-        Shell.get_tp_contacts(conn, [inviter],
-                contactFeatures,
-                Lang.bind(this, this._createRoomInviteSource, channel, context, dispatchOp));
-
-        context.delay();
-     },
-
-    _createRoomInviteSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get inviter');
-            return;
-        }
-
-        // We got the TpContact
-
         // FIXME: We don't have a 'chat room' icon (bgo #653737) use
         // system-users for now as Empathy does.
         let source = new ApproverSource(dispatchOp, _("Invitation"),
                                         Gio.icon_new_for_string('system-users'));
         Main.messageTray.add(source);
 
-        let notif = new RoomInviteNotification(source, dispatchOp, channel, contacts[0]);
+        let notif = new RoomInviteNotification(source, dispatchOp, channel, inviter);
         source.notify(notif);
         context.accept();
     },
@@ -278,13 +237,19 @@ const Client = new Lang.Class({
         let channel = channels[0];
         let chanType = channel.get_channel_type();
 
+        if (Shell.is_channel_invalidated(channel)) {
+            Shell.decline_dispatch_op(context, 'Channel is invalidated');
+            return;
+        }
+
         if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT)
             this._approveTextChannel(account, conn, channel, dispatchOp, context);
-        else if (chanType == Tp.IFACE_CHANNEL_TYPE_STREAMED_MEDIA ||
-                 chanType == 'org.freedesktop.Telepathy.Channel.Type.Call.DRAFT')
+        else if (chanType == Tp.IFACE_CHANNEL_TYPE_CALL)
             this._approveCall(account, conn, channel, dispatchOp, context);
         else if (chanType == Tp.IFACE_CHANNEL_TYPE_FILE_TRANSFER)
             this._approveFileTransfer(account, conn, channel, dispatchOp, context);
+        else
+            Shell.decline_dispatch_op(context, 'Unsupported channel type');
     },
 
     _approveTextChannel: function(account, conn, channel, dispatchOp, context) {
@@ -308,27 +273,11 @@ const Client = new Lang.Class({
     },
 
     _approveCall: function(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
-
-        Shell.get_tp_contacts(conn, [targetHandle],
-                contactFeatures,
-                Lang.bind(this, this._createAudioVideoSource, channel, context, dispatchOp));
-
-        context.delay();
-    },
-
-    _createAudioVideoSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get inviter');
-            return;
-        }
-
         let isVideo = false;
 
         let props = channel.borrow_immutable_properties();
 
-        if (props['org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo'] ||
-            props[Tp.PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO])
+        if (props[Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO])
           isVideo = true;
 
         // We got the TpContact
@@ -337,27 +286,13 @@ const Client = new Lang.Class({
                                         Gio.icon_new_for_string('audio-input-microphone'));
         Main.messageTray.add(source);
 
-        let notif = new AudioVideoNotification(source, dispatchOp, channel, contacts[0], isVideo);
+        let notif = new AudioVideoNotification(source, dispatchOp, channel,
+            channel.get_target_contact(), isVideo);
         source.notify(notif);
         context.accept();
     },
 
     _approveFileTransfer: function(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
-
-        Shell.get_tp_contacts(conn, [targetHandle],
-                contactFeatures,
-                Lang.bind(this, this._createFileTransferSource, channel, context, dispatchOp));
-
-        context.delay();
-    },
-
-    _createFileTransferSource: function(connection, contacts, failed, channel, context, dispatchOp) {
-        if (contacts.length < 1) {
-            Shell.decline_dispatch_op(context, 'Failed to get file sender');
-            return;
-        }
-
         // Use the icon of the file being transferred
         let gicon = Gio.content_type_get_icon(channel.get_mime_type());
 
@@ -365,7 +300,8 @@ const Client = new Lang.Class({
         let source = new ApproverSource(dispatchOp, _("File Transfer"), gicon);
         Main.messageTray.add(source);
 
-        let notif = new FileTransferNotification(source, dispatchOp, channel, contacts[0]);
+        let notif = new FileTransferNotification(source, dispatchOp, channel,
+            channel.get_target_contact());
         source.notify(notif);
         context.accept();
     },
@@ -442,8 +378,9 @@ const Client = new Lang.Class({
 
     _ensureSubscriptionSource: function() {
         if (this._subscriptionSource == null) {
-            this._subscriptionSource = new MultiNotificationSource(
-                _("Subscription request"), 'gtk-dialog-question');
+            this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
+                                                              'gtk-dialog-question',
+                                                              St.IconType.FULLCOLOR);
             Main.messageTray.add(this._subscriptionSource);
             this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
                 this._subscriptionSource = null;
@@ -478,8 +415,9 @@ const Client = new Lang.Class({
 
     _ensureAccountSource: function() {
         if (this._accountSource == null) {
-            this._accountSource = new MultiNotificationSource(
-                _("Connection error"), 'gtk-dialog-error');
+            this._accountSource = new MessageTray.Source(_("Connection error"),
+                                                         'gtk-dialog-error',
+                                                         St.IconType.FULLCOLOR);
             Main.messageTray.add(this._accountSource);
             this._accountSource.connect('destroy', Lang.bind(this, function () {
                 this._accountSource = null;
@@ -495,14 +433,13 @@ const ChatSource = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function(account, conn, channel, contact, client) {
-        this.parent(contact.get_alias());
-
-        this.isChat = true;
-
         this._account = account;
         this._contact = contact;
         this._client = client;
 
+        this.parent(contact.get_alias());
+
+        this.isChat = true;
         this._pendingMessages = [];
 
         this._conn = conn;
@@ -523,8 +460,6 @@ const ChatSource = new Lang.Class({
         this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
         this._pendingId = this._channel.connect('pending-message-removed', Lang.bind(this, this._pendingRemoved));
 
-        this._setSummaryIcon(this.createNotificationIcon());
-
         this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
         this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
         this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
@@ -587,10 +522,10 @@ const ChatSource = new Lang.Class({
     _getLogMessages: function() {
         let logManager = Tpl.LogManager.dup_singleton();
         let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
-        Shell.get_contact_events(logManager,
-                                 this._account, entity,
-                                 SCROLLBACK_HISTORY_LINES,
-                                 Lang.bind(this, this._displayPendingMessages));
+
+        logManager.get_filtered_events_async(this._account, entity,
+                                             Tpl.EventTypeMask.TEXT, SCROLLBACK_HISTORY_LINES,
+                                             null, Lang.bind(this, this._displayPendingMessages));
     },
 
     _displayPendingMessages: function(logManager, result) {
@@ -739,12 +674,12 @@ const ChatSource = new Lang.Class({
         if (presence == Tp.ConnectionPresenceType.AVAILABLE) {
             msg = _("%s is online.").format(title);
             shouldNotify = (this._presence == Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.OFFLINE ||
-                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
+        } else if (presence == Tp.ConnectionPresenceType.OFFLINE) {
             presence = Tp.ConnectionPresenceType.OFFLINE;
             msg = _("%s is offline.").format(title);
             shouldNotify = (this._presence != Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.AWAY) {
+        } else if (presence == Tp.ConnectionPresenceType.AWAY ||
+                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
             msg = _("%s is away.").format(title);
             shouldNotify = false;
         } else if (presence == Tp.ConnectionPresenceType.BUSY) {
@@ -880,7 +815,7 @@ const ChatNotification = new Lang.Class({
         let groups = this._contentArea.get_children();
         for (let i = 0; i < groups.length; i++) {
             let group = groups[i];
-            if (group.get_children().length == 0)
+            if (group.get_n_children() == 0)
                 group.destroy();
         }
     },
@@ -930,6 +865,8 @@ const ChatNotification = new Lang.Class({
 
         this._lastGroupActor.add(body, props.childProps);
 
+        this.updated();
+
         let timestamp = props.timestamp;
         this._history.unshift({ actor: body, time: timestamp,
                                 realMessage: group != 'meta' });
@@ -1077,10 +1014,9 @@ const ApproverSource = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function(dispatchOp, text, gicon) {
-        this.parent(text);
-
         this._gicon = gicon;
-        this._setSummaryIcon(this.createNotificationIcon());
+
+        this.parent(text);
 
         this._dispatchOp = dispatchOp;
 
@@ -1103,7 +1039,6 @@ const ApproverSource = new Lang.Class({
 
     createNotificationIcon: function() {
         return new St.Icon({ gicon: this._gicon,
-                             icon_type: St.IconType.FULLCOLOR,
                              icon_size: this.ICON_SIZE });
     }
 });
@@ -1162,7 +1097,7 @@ const AudioVideoNotification = new Lang.Class({
              /* translators: argument is a contact name like Alice for example. */
             title = _("Call from %s").format(contact.get_alias());
 
-        this.parent(this, source, title, null, { customContent: true });
+        this.parent(source, title, null, { customContent: true });
         this.setResident(true);
 
         this.addButton('reject', _("Reject"));
@@ -1193,8 +1128,7 @@ const FileTransferNotification = new Lang.Class({
     Extends: MessageTray.Notification,
 
     _init: function(source, dispatchOp, channel, contact) {
-        this.parent(this,
-                    source,
+        this.parent(source,
                     /* To translators: The first parameter is
                      * the contact's alias and the second one is the
                      * file name. The string will be something
@@ -1227,47 +1161,13 @@ const FileTransferNotification = new Lang.Class({
     }
 });
 
-// A notification source that can embed multiple notifications
-const MultiNotificationSource = new Lang.Class({
-    Name: 'MultiNotificationSource',
-    Extends: MessageTray.Source,
-
-    _init: function(title, icon) {
-        this.parent(title);
-
-        this._icon = icon;
-        this._setSummaryIcon(this.createNotificationIcon());
-        this._nbNotifications = 0;
-    },
-
-    notify: function(notification) {
-        this.parent(notification);
-
-        this._nbNotifications += 1;
-
-        // Display the source while there is at least one notification
-        notification.connect('destroy', Lang.bind(this, function () {
-            this._nbNotifications -= 1;
-
-            if (this._nbNotifications == 0)
-                this.destroy();
-        }));
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ gicon: Gio.icon_new_for_string(this._icon),
-                             icon_type: St.IconType.FULLCOLOR,
-                             icon_size: this.ICON_SIZE });
-    }
-});
-
 // Subscription request
 const SubscriptionRequestNotification = new Lang.Class({
     Name: 'SubscriptionRequestNotification',
     Extends: MessageTray.Notification,
 
     _init: function(source, contact) {
-        this.parent(this, source,
+        this.parent(source,
                     /* To translators: The parameter is the contact's alias */
                     _("%s would like permission to see when you are online").format(contact.get_alias()),
                     null, { customContent: true });
@@ -1394,7 +1294,7 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_FAILED)]
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
   = _("Connection has been lost");
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
-  = _("This resource is already connected to the server");
+  = _("This account is already connected to the server");
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
   = _("Connection has been replaced by a new connection using the same resource");
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
@@ -1407,6 +1307,8 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
   = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
 _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
   = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
+_connectionErrorMessages['org.freedesktop.DBus.Error.NoReply']
+  = _("Internal error");
 
 const AccountNotification = new Lang.Class({
     Name: 'AccountNotification',

js/ui/tweener.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
@@ -209,9 +210,14 @@ const ClutterFrameTicker = new Lang.Class({
 
     _init : function() {
         // We don't have a finite duration; tweener will tell us to stop
-        // when we need to stop, so use 1000 seconds as "infinity"
+        // when we need to stop, so use 1000 seconds as "infinity", and
+        // set the timeline to loop. Doing this means we have to track
+        // time ourselves, since clutter timeline's time will cycle
+        // instead of strictly increase.
         this._timeline = new Clutter.Timeline({ duration: 1000*1000 });
+        this._timeline.set_loop(true);
         this._startTime = -1;
+        this._currentTime = -1;
 
         this._timeline.connect('new-frame', Lang.bind(this,
             function(timeline, frame) {
@@ -234,17 +240,18 @@ const ClutterFrameTicker = new Lang.Class({
         // That looks bad, so we always start at the first frame of the
         // animation then only do frame dropping from there.
         if (this._startTime < 0)
-            this._startTime = this._timeline.get_elapsed_time();
+            this._startTime = GLib.get_monotonic_time() / 1000.0;
 
         // currentTime is in milliseconds
         let perf_log = Shell.PerfLog.get_default();
+        this._currentTime = GLib.get_monotonic_time() / 1000.0 - this._startTime;
         perf_log.event("tweener.framePrepareStart");
         this.emit('prepare-frame');
         perf_log.event("tweener.framePrepareDone");
     },
 
     getTime : function() {
-        return this._timeline.get_elapsed_time();
+        return this._currentTime;
     },
 
     start : function() {
@@ -257,6 +264,7 @@ const ClutterFrameTicker = new Lang.Class({
     stop : function() {
         this._timeline.stop();
         this._startTime = -1;
+        this._currentTime = -1;
         global.end_work();
     }
 });

js/ui/userMenu.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const AccountsService = imports.gi.AccountsService;
+const GdmGreeter = imports.gi.GdmGreeter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@@ -9,6 +10,7 @@ const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Tp = imports.gi.TelepathyGLib;
 const UPowerGlib = imports.gi.UPowerGlib;
+const Atk = imports.gi.Atk;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@@ -56,6 +58,7 @@ const IMStatusItem = new Lang.Class({
             this._icon.icon_name = iconName;
 
         this.label = new St.Label({ text: label });
+        this.actor.label_actor = this.label;
         this.addActor(this.label);
     }
 });
@@ -130,7 +133,7 @@ const IMStatusChooserItem = new Lang.Class({
         item = new IMStatusItem(_("Busy"), 'user-busy');
         this._combo.addMenuItem(item, IMStatus.BUSY);
 
-        item = new IMStatusItem(_("Hidden"), 'user-invisible');
+        item = new IMStatusItem(_("Invisible"), 'user-invisible');
         this._combo.addMenuItem(item, IMStatus.HIDDEN);
 
         item = new IMStatusItem(_("Away"), 'user-away');
@@ -163,6 +166,8 @@ const IMStatusChooserItem = new Lang.Class({
                                  Lang.bind(this, this._IMAccountsChanged));
         this._accountMgr.connect('account-removed',
                                  Lang.bind(this, this._IMAccountsChanged));
+        this._accountMgr.connect('account-validity-changed',
+                                 Lang.bind(this, this._IMAccountsChanged));
         this._accountMgr.prepare_async(null, Lang.bind(this,
             function(mgr) {
                 let [presence, status, msg] = mgr.get_most_available_presence();
@@ -239,7 +244,8 @@ const IMStatusChooserItem = new Lang.Class({
     },
 
     _setIconFromFile: function(iconFile) {
-        this._iconBin.set_style('background-image: url("' + iconFile + '");');
+        this._iconBin.set_style('background-image: url("' + iconFile + '");' +
+                                'background-size: contain;');
         this._iconBin.child = null;
     },
 
@@ -375,7 +381,8 @@ const IMStatusChooserItem = new Lang.Class({
         if (sessionStatus == GnomeSession.PresenceStatus.IDLE) {
             // Only change presence if the current one is "more present" than
             // idle
-            if (this._currentPresence != Tp.ConnectionPresenceType.OFFLINE)
+            if (this._currentPresence != Tp.ConnectionPresenceType.OFFLINE &&
+                this._currentPresence != Tp.ConnectionPresenceType.HIDDEN)
                 return Tp.ConnectionPresenceType.EXTENDED_AWAY;
         }
 
@@ -386,8 +393,15 @@ const IMStatusChooserItem = new Lang.Class({
         if (!this._imPresenceRestored)
             return;
 
+        let savedStatus = global.settings.get_int('saved-session-presence');
         if (!this._sessionPresenceRestored) {
-            let savedStatus = global.settings.get_int('saved-session-presence');
+
+            // We should never save/restore a status other than AVAILABLE
+            // or BUSY
+            if (savedStatus != GnomeSession.PresenceStatus.AVAILABLE &&
+                savedStatus != GnomeSession.PresenceStatus.BUSY)
+                savedStatus = GnomeSession.PresenceStatus.AVAILABLE;
+
             if (sessionStatus != savedStatus) {
                 this._presence.status = savedStatus;
                 return;
@@ -395,7 +409,10 @@ const IMStatusChooserItem = new Lang.Class({
             this._sessionPresenceRestored = true;
         }
 
-        global.settings.set_int('saved-session-presence', sessionStatus);
+        if ((sessionStatus == GnomeSession.PresenceStatus.AVAILABLE ||
+             sessionStatus == GnomeSession.PresenceStatus.BUSY) &&
+            savedStatus != sessionStatus)
+            global.settings.set_int('saved-session-presence', sessionStatus);
 
         let [presence, s, msg] = this._accountMgr.get_most_available_presence();
         let newPresence, status;
@@ -421,6 +438,8 @@ const UserMenuButton = new Lang.Class({
     _init: function() {
         this.parent(0.0);
 
+        this.actor.accessible_role = Atk.Role.MENU;
+
         let box = new St.BoxLayout({ name: 'panelUserMenu' });
         this.actor.add_actor(box);
 
@@ -455,16 +474,26 @@ const UserMenuButton = new Lang.Class({
                                        style_class: 'popup-menu-icon' });
         this._idleIcon = new St.Icon({ icon_name: 'user-idle',
                                        style_class: 'popup-menu-icon' });
+        this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending',
+                                          style_class: 'popup-menu-icon' });
 
         this._accountMgr.connect('most-available-presence-changed',
                                   Lang.bind(this, this._updatePresenceIcon));
+        this._accountMgr.connect('account-enabled',
+                                  Lang.bind(this, this._onAccountEnabled));
+        this._accountMgr.connect('account-disabled',
+                                 Lang.bind(this, this._onAccountDisabled));
+        this._accountMgr.connect('account-removed',
+                                  Lang.bind(this, this._onAccountDisabled));
         this._accountMgr.prepare_async(null, Lang.bind(this,
             function(mgr) {
                 let [presence, s, msg] = mgr.get_most_available_presence();
                 this._updatePresenceIcon(mgr, presence, s, msg);
+                this._setupAccounts();
             }));
 
         this._name = new St.Label();
+        this.actor.label_actor = this._name;
         box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
         this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
         this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));
@@ -478,13 +507,13 @@ const UserMenuButton = new Lang.Class({
         }));
 
         this._userManager.connect('notify::is-loaded',
-                                  Lang.bind(this, this._updateSwitchUser));
+                                  Lang.bind(this, this._updateMultiUser));
         this._userManager.connect('notify::has-multiple-users',
-                                  Lang.bind(this, this._updateSwitchUser));
+                                  Lang.bind(this, this._updateMultiUser));
         this._userManager.connect('user-added',
-                                  Lang.bind(this, this._updateSwitchUser));
+                                  Lang.bind(this, this._updateMultiUser));
         this._userManager.connect('user-removed',
-                                  Lang.bind(this, this._updateSwitchUser));
+                                  Lang.bind(this, this._updateMultiUser));
         this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
                                        Lang.bind(this, this._updateSwitchUser));
         this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
@@ -523,30 +552,32 @@ const UserMenuButton = new Lang.Class({
             this._name.set_text("");
     },
 
+    _updateMultiUser: function() {
+        this._updateSwitchUser();
+        this._updateLogout();
+    },
+
     _updateSwitchUser: function() {
         let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        if (allowSwitch &&
-            this._userManager.can_switch() &&
-            this._userManager.has_multiple_users)
-            this._loginScreenItem.actor.show();
-        else
-            this._loginScreenItem.actor.hide();
+        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
+        let multiSession = GdmGreeter.get_session_ids().length > 1;
+
+        this._loginScreenItem.label.set_text(multiUser ? _("Switch User")
+                                                       : _("Switch Session"));
+        this._loginScreenItem.actor.visible = allowSwitch && (multiUser || multiSession);
     },
 
     _updateLogout: function() {
         let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        if (allowLogout)
-            this._logoutItem.actor.show();
-        else
-            this._logoutItem.actor.hide();
+        let multiUser = this._userManager.has_multiple_users;
+        let multiSession = GdmGreeter.get_session_ids().length > 1;
+
+        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
     },
 
     _updateLockScreen: function() {
         let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        if (allowLockScreen)
-            this._lockScreenItem.actor.show();
-        else
-            this._lockScreenItem.actor.hide();
+        this._lockScreenItem.actor.visible = allowLockScreen;
     },
 
     _updateHaveShutdown: function() {
@@ -565,19 +596,16 @@ const UserMenuButton = new Lang.Class({
         if (!this._suspendOrPowerOffItem)
             return;
 
-        if (!this._haveShutdown && !this._haveSuspend)
-            this._suspendOrPowerOffItem.actor.hide();
-        else
-            this._suspendOrPowerOffItem.actor.show();
+        this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;
 
-        // If we can't suspend show Power Off... instead
+        // If we can't power off show Suspend instead
         // and disable the alt key
-        if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
-        } else if (!this._haveShutdown) {
+        if (!this._haveShutdown) {
             this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
+        } else if (!this._haveSuspend) {
+            this._suspendOrPowerOffItem.updateText(_("Power Off"), null);
         } else {
-            this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
+            this._suspendOrPowerOffItem.updateText(_("Power Off"), _("Suspend"));
         }
     },
 
@@ -601,44 +629,85 @@ const UserMenuButton = new Lang.Class({
             this._iconBox.child = this._offlineIcon;
     },
 
+    _setupAccounts: function() {
+        let accounts = this._accountMgr.get_valid_accounts();
+        for (let i = 0; i < accounts.length; i++) {
+            accounts[i]._changingId = accounts[i].connect('notify::connection-status',
+                                                          Lang.bind(this, this._updateChangingPresence));
+        }
+        this._updateChangingPresence();
+    },
+
+    _onAccountEnabled: function(accountMgr, account) {
+        if (!account._changingId)
+            account._changingId = account.connect('notify::connection-status',
+                                                  Lang.bind(this, this._updateChangingPresence));
+        this._updateChangingPresence();
+    },
+
+    _onAccountDisabled: function(accountMgr, account) {
+        account.disconnect(account._changingId);
+        account._changingId = 0;
+        this._updateChangingPresence();
+    },
+
+    _updateChangingPresence: function() {
+        let accounts = this._accountMgr.get_valid_accounts();
+        let changing = false;
+        for (let i = 0; i < accounts.length; i++) {
+            if (accounts[i].connection_status == Tp.ConnectionStatus.CONNECTING) {
+                changing = true;
+                break;
+            }
+        }
+
+        if (changing) {
+            this._iconBox.child = this._pendingIcon;
+        } else {
+            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
+            this._updatePresenceIcon(this._accountMgr, presence, s, msg);
+        }
+    },
+
     _createSubMenu: function() {
         let item;
 
         item = new IMStatusChooserItem();
-        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        if (Main.sessionMode.allowSettings)
+            item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
         this.menu.addMenuItem(item);
         this._statusChooser = item;
 
         item = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
-        item.connect('activate', Lang.bind(this, this._updatePresenceStatus));
+        item.connect('toggled', Lang.bind(this, this._updatePresenceStatus));
         this.menu.addMenuItem(item);
         this._notificationsSwitch = item;
 
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
-        item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
-        this.menu.addMenuItem(item);
+        if (Main.sessionMode.allowSettings) {
+            item = new PopupMenu.PopupMenuItem(_("System Settings"));
+            item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+            this.menu.addMenuItem(item);
+        }
 
-        item = new PopupMenu.PopupMenuItem(_("System Settings"));
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+        item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
+                                                      _("Suspend"));
         this.menu.addMenuItem(item);
+        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
+        this._suspendOrPowerOffItem = item;
+        this._updateSuspendOrPowerOff();
 
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
-        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
-        this.menu.addMenuItem(item);
-        this._lockScreenItem = item;
-
         item = new PopupMenu.PopupMenuItem(_("Switch User"));
         item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
         this.menu.addMenuItem(item);
         this._loginScreenItem = item;
 
-        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
+        item = new PopupMenu.PopupMenuItem(_("Log Out"));
         item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
         this.menu.addMenuItem(item);
         this._logoutItem = item;
@@ -646,12 +715,10 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
-                                                      _("Power Off..."));
+        item = new PopupMenu.PopupMenuItem(_("Lock"));
+        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
         this.menu.addMenuItem(item);
-        this._suspendOrPowerOffItem = item;
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._updateSuspendOrPowerOff();
+        this._lockScreenItem = item;
     },
 
     _updatePresenceStatus: function(item, event) {
@@ -679,12 +746,6 @@ const UserMenuButton = new Lang.Class({
         app.activate();
     },
 
-    _onOnlineAccountsActivate: function() {
-        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_setting('gnome-online-accounts-panel.desktop');
-        app.activate(-1);
-    },
-
     _onPreferencesActivate: function() {
         Main.overview.hide();
         let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
@@ -713,14 +774,14 @@ const UserMenuButton = new Lang.Class({
     _onSuspendOrPowerOffActivate: function() {
         Main.overview.hide();
 
-        if (this._haveSuspend &&
+        if (this._haveShutdown &&
             this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            // Ensure we only suspend after the screensaver has activated
-            this._screenSaverProxy.SetActiveRemote(true, Lang.bind(this, function() {
+            this._session.ShutdownRemote();
+        } else {
+            // Ensure we only suspend after locking the screen
+            this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
                 this._upClient.suspend_sync(null);
             }));
-        } else {
-            this._session.ShutdownRemote();
         }
     }
 });

js/ui/viewSelector.js

@@ -133,14 +133,14 @@ const SearchTab = new Lang.Class({
         this._text.connect('text-changed', Lang.bind(this, this._onTextChanged));
         this._text.connect('key-press-event', Lang.bind(this, function (o, e) {
             // We can't connect to 'activate' here because search providers
-            // might want to do something with the modifiers in activateSelected.
+            // might want to do something with the modifiers in activateDefault.
             let symbol = e.get_key_symbol();
             if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
                 if (this._searchTimeoutId > 0) {
                     Mainloop.source_remove(this._searchTimeoutId);
                     this._doSearch();
                 }
-                this._searchResults.activateSelected();
+                this._searchResults.activateDefault();
                 return true;
             }
             return false;
@@ -148,9 +148,33 @@ const SearchTab = new Lang.Class({
 
         this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
 
-        global.stage.connect('notify::key-focus', Lang.bind(this, this._updateCursorVisibility));
+        global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged));
 
         this._capturedEventId = 0;
+
+        this._text.connect('key-focus-in', Lang.bind(this, function() {
+            this._searchResults.highlightDefault(true);
+        }));
+        this._text.connect('key-focus-out', Lang.bind(this, function() {
+            this._searchResults.highlightDefault(false);
+        }));
+
+        // Since the entry isn't inside the results container we install this
+        // dummy widget as the last results container child so that we can
+        // include the entry in the keynav tab path...
+        this._focusTrap = new St.Bin({ can_focus: true });
+        this._focusTrap.connect('key-focus-in', Lang.bind(this, function() {
+            this._entry.grab_key_focus();
+        }));
+        // ... but make it unfocusable using arrow keys keynav by making its
+        // bounding box always contain the possible focus source's bounding
+        // box since StWidget's keynav logic won't ever select it as a target
+        // in that case.
+        this._focusTrap.add_constraint(new Clutter.BindConstraint({ source: this._searchResults.actor,
+                                                                    coordinate: Clutter.BindCoordinate.ALL }));
+        this._searchResults.actor.add_actor(this._focusTrap);
+
+        global.focus_manager.add_group(this._searchResults.actor);
     },
 
     hide: function() {
@@ -163,21 +187,29 @@ const SearchTab = new Lang.Class({
         // incorrectly when we remove focus
         // (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
         if (this._text.text != '')
-            this._reset();
+            this.reset();
     },
 
-    _reset: function () {
-        this._text.text = '';
-
+    reset: function () {
         global.stage.set_key_focus(null);
 
+        this._entry.text = '';
+
         this._text.set_cursor_visible(true);
         this._text.set_selection(0, 0);
     },
 
-    _updateCursorVisibility: function() {
+    _onStageKeyFocusChanged: function() {
         let focus = global.stage.get_key_focus();
-        this._text.set_cursor_visible(focus == this._text);
+        let appearFocused = (this._entry.contains(focus) ||
+                             this._searchResults.actor.contains(focus));
+
+        this._text.set_cursor_visible(appearFocused);
+
+        if (appearFocused)
+            this._entry.add_style_pseudo_class('focus');
+        else
+            this._entry.remove_style_pseudo_class('focus');
     },
 
     _onMapped: function() {
@@ -228,7 +260,7 @@ const SearchTab = new Lang.Class({
             if (this._iconClickedId == 0) {
                 this._iconClickedId = this._entry.connect('secondary-icon-clicked',
                     Lang.bind(this, function() {
-                        this._reset();
+                        this.reset();
                     }));
             }
             this._activate();
@@ -254,25 +286,37 @@ const SearchTab = new Lang.Class({
 
     _onKeyPress: function(entry, event) {
         let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Up) {
-            if (!this.active)
-                return true;
-            this._searchResults.selectUp(false);
-
-            return true;
-        } else if (symbol == Clutter.Down) {
-            if (!this.active)
-                return true;
-
-            this._searchResults.selectDown(false);
-            return true;
-        } else if (symbol == Clutter.Escape) {
+        if (symbol == Clutter.Escape) {
             if (this._isActivated()) {
-                this._reset();
+                this.reset();
+                return true;
+            }
+        } else if (this.active) {
+            let arrowNext, nextDirection;
+            if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
+                arrowNext = Clutter.Left;
+                nextDirection = Gtk.DirectionType.LEFT;
+            } else {
+                arrowNext = Clutter.Right;
+                nextDirection = Gtk.DirectionType.RIGHT;
+            }
+
+            if (symbol == Clutter.Tab) {
+                this._searchResults.navigateFocus(Gtk.DirectionType.TAB_FORWARD);
+                return true;
+            } else if (symbol == Clutter.ISO_Left_Tab) {
+                this._focusTrap.can_focus = false;
+                this._searchResults.navigateFocus(Gtk.DirectionType.TAB_BACKWARD);
+                this._focusTrap.can_focus = true;
+                return true;
+            } else if (symbol == Clutter.Down) {
+                this._searchResults.navigateFocus(Gtk.DirectionType.DOWN);
+                return true;
+            } else if (symbol == arrowNext && this._text.position == -1) {
+                this._searchResults.navigateFocus(nextDirection);
                 return true;
             }
         }
-
         return false;
     },
 
@@ -284,7 +328,7 @@ const SearchTab = new Lang.Class({
                 // the user clicked outside after activating the entry, but
                 // with no search term entered and no keyboard button pressed
                 // - cancel the search
-                this._reset();
+                this.reset();
             }
         }
 
@@ -486,7 +530,7 @@ const ViewSelector = new Lang.Class({
         let childBox = new Clutter.ActorBox();
         childBox.y1 = 0;
         childBox.y2 = allocHeight;
-        if (this.actor.get_direction() == St.TextDirection.RTL) {
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
             childBox.x1 = allocWidth - barNatWidth;
             childBox.x2 = allocWidth;
         } else {
@@ -495,7 +539,7 @@ const ViewSelector = new Lang.Class({
         }
         this._tabBox.allocate(childBox, flags);
 
-        if (this.actor.get_direction() == St.TextDirection.RTL) {
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
             childBox.x1 = 0;
             childBox.x2 = searchNatWidth;
         } else {
@@ -511,24 +555,34 @@ const ViewSelector = new Lang.Class({
     },
 
     _onStageKeyPress: function(actor, event) {
-        let modifiers = Shell.get_event_state(event);
+        let modifiers = event.get_state();
         let symbol = event.get_key_symbol();
 
         if (symbol == Clutter.Escape) {
-            Main.overview.hide();
+            if (this._searchTab.active)
+                this._searchTab.reset();
+            else
+                Main.overview.hide();
             return true;
-        } else if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
-            if (symbol == Clutter.Page_Up) {
-                if (!this._searchTab.active)
+        } else if (Clutter.keysym_to_unicode(symbol) ||
+                   (symbol == Clutter.BackSpace && this._searchTab.active)) {
+            this._searchTab.startSearch(event);
+        } else if (!this._searchTab.active) {
+            if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
+                if (symbol == Clutter.Page_Up) {
                     this._prevTab();
-                return true;
-            } else if (symbol == Clutter.Page_Down) {
-                if (!this._searchTab.active)
+                    return true;
+                } else if (symbol == Clutter.Page_Down) {
                     this._nextTab();
+                    return true;
+                }
+            } else if (symbol == Clutter.Tab) {
+                this._activeTab.page.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+                return true;
+            } else if (symbol == Clutter.ISO_Left_Tab) {
+                this._activeTab.page.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false);
                 return true;
             }
-        } else if (Clutter.keysym_to_unicode(symbol)) {
-            this._searchTab.startSearch(event);
         }
         return false;
     },

js/ui/wanda.js

@@ -17,7 +17,7 @@ const FISH_NAME = 'wanda';
 const FISH_SPEED = 300;
 const FISH_COMMAND = 'fortune';
 
-const GNOME_PANEL_PIXMAPDIR = '../gnome-panel/pixmaps';
+const GNOME_PANEL_PIXMAPDIR = '../gnome-panel/fish';
 const FISH_GROUP = 'Fish Animation';
 
 const MAGIC_FISH_KEY = 'free the fish';
@@ -89,9 +89,9 @@ const WandaIcon = new Lang.Class({
             return true;
         }
 
-        this._animations.get_nth_child(this._i).hide();
+        this._animations.get_child_at_index(this._i).hide();
         this._i = (this._i + 1) % n;
-        this._animations.get_nth_child(this._i).show();
+        this._animations.get_child_at_index(this._i).show();
 
         return true;
     },
@@ -124,14 +124,14 @@ const FortuneDialog = new Lang.Class({
             text = _("Sorry, no wisdom for you today:\n%s").format(e.message);
         }
 
-        this._title = new St.Label({ style_class: 'polkit-dialog-headline',
+        this._title = new St.Label({ style_class: 'prompt-dialog-headline',
                                      text: _("%s the Oracle says").format(name) });
-        this._label = new St.Label({ style_class: 'polkit-dialog-description',
+        this._label = new St.Label({ style_class: 'prompt-dialog-description',
                                      text: text });
         this._label.clutter_text.line_wrap = true;
 
         this._box = new St.BoxLayout({ vertical: true,
-                                       style_class: 'polkit-dialog' // this is just to force a reasonable width
+                                       style_class: 'prompt-dialog' // this is just to force a reasonable width
                                      });
         this._box.add(this._title, { align: St.Align.MIDDLE });
         this._box.add(this._label, { expand: true });
@@ -168,33 +168,35 @@ const WandaSearchProvider = new Lang.Class({
         this.parent(_("Your favorite Easter Egg"));
     },
 
-    getResultMeta: function(fish) {
-        return { 'id': fish,
-                 'name': capitalize(fish),
-                 'createIcon': function(iconSize) {
-                     // for DND only (maybe could be improved)
-                     // DON'T use St.Icon here, it crashes the shell
-                     // (dnd.js code assumes it can query the actor size
-                     // without parenting it, while StWidget accesses
-                     // StThemeNode in get_preferred_width/height, which
-                     // triggers an assertion failure)
-                     return St.TextureCache.get_default().load_icon_name(null,
-                                                                         'face-smile',
-                                                                         St.IconType.FULLCOLOR,
-                                                                         iconSize);
-                 }
-               };
+    getResultMetas: function(fish, callback) {
+        callback([{ 'id': fish[0], // there may be many fish in the sea, but
+                    // only one which speaks the truth!
+                    'name': capitalize(fish[0]),
+                    'createIcon': function(iconSize) {
+                        // for DND only (maybe could be improved)
+                        // DON'T use St.Icon here, it crashes the shell
+                        // (dnd.js code assumes it can query the actor size
+                        // without parenting it, while StWidget accesses
+                        // StThemeNode in get_preferred_width/height, which
+                        // triggers an assertion failure)
+                        return St.TextureCache.get_default().load_icon_name(null,
+                                                                            'face-smile',
+                                                                            St.IconType.FULLCOLOR,
+                                                                            iconSize);
+                    }
+                  }]);
     },
 
     getInitialResultSet: function(terms) {
         if (terms.join(' ') == MAGIC_FISH_KEY) {
-            return [ FISH_NAME ];
+            this.searchSystem.pushResults(this, [ FISH_NAME ]);
+        } else {
+            this.searchSystem.pushResults(this, []);
         }
-        return [];
     },
 
     getSubsearchResultSet: function(previousResults, terms) {
-        return this.getInitialResultSet(terms);
+        this.getInitialResultSet(terms);
     },
 
     activateResult: function(fish, params) {

js/ui/windowAttentionHandler.js

@@ -14,6 +14,12 @@ const WindowAttentionHandler = new Lang.Class({
         global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
     },
 
+    _getTitleAndBanner: function(app, window) {
+        let title = app.get_name();
+        let banner = _("'%s' is ready").format(window.get_title());
+        return [title, banner]
+    },
+
     _onWindowDemandsAttention : function(display, window) {
         // We don't want to show the notification when the window is already focused,
         // because this is rather pointless.
@@ -30,16 +36,15 @@ const WindowAttentionHandler = new Lang.Class({
         let source = new Source(app, window);
         Main.messageTray.add(source);
 
-        let banner = _("'%s' is ready").format(window.title);
-        let title = app.get_name();
+        let [title, banner] = this._getTitleAndBanner(app, window);
 
         let notification = new MessageTray.Notification(source, title, banner);
         source.notify(notification);
 
-        source.signalIDs.push(window.connect('notify::title',
-                                             Lang.bind(this, function() {
-                                                 notification.update(title, banner);
-                                             })));
+        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {
+            let [title, banner] = this._getTitleAndBanner(app, window);
+            notification.update(title, banner);
+        })));
     }
 });
 
@@ -48,10 +53,10 @@ const Source = new Lang.Class({
     Extends: MessageTray.Source,
 
     _init: function(app, window) {
-        this.parent(app.get_name());
         this._window = window;
         this._app = app;
-        this._setSummaryIcon(this.createNotificationIcon());
+
+        this.parent(app.get_name());
 
         this.signalIDs = [];
         this.signalIDs.push(this._window.connect('notify::demands-attention', Lang.bind(this, function() { this.destroy(); })));

js/ui/windowManager.js

@@ -13,6 +13,7 @@ const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
+const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 const WINDOW_ANIMATION_TIME = 0.25;
 const DIM_TIME = 0.500;
 const UNDIM_TIME = 0.250;
@@ -134,6 +135,10 @@ const WindowManager = new Lang.Class({
                                             Lang.bind(this, this._startAppSwitcher));
         Meta.keybindings_set_custom_handler('switch-panels',
                                             Lang.bind(this, this._startA11ySwitcher));
+        global.display.add_keybinding('open-application-menu',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._openAppMenu));
 
         Main.overview.connect('showing', Lang.bind(this, function() {
             for (let i = 0; i < this._dimmedWindows.length; i++)
@@ -186,7 +191,7 @@ const WindowManager = new Lang.Class({
 
         let primary = Main.layoutManager.primaryMonitor;
         let xDest = primary.x;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             xDest += primary.width;
 
         Tweener.addTween(actor,
@@ -547,6 +552,10 @@ const WindowManager = new Lang.Class({
         Main.ctrlAltTabManager.popup(backwards, binding.get_mask());
     },
 
+    _openAppMenu : function(display, screen, window, event, binding) {
+        Main.panel.openAppMenu();
+    },
+
     _showWorkspaceSwitcher : function(display, screen, window, binding) {
         if (screen.n_workspaces == 1)
             return;
@@ -567,7 +576,7 @@ const WindowManager = new Lang.Class({
     },
 
     actionMoveWorkspaceLeft: function() {
-        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
         let activeWorkspaceIndex = global.screen.get_active_workspace_index();
         let indexToActivate = activeWorkspaceIndex;
         if (rtl && activeWorkspaceIndex < global.screen.n_workspaces - 1)
@@ -583,7 +592,7 @@ const WindowManager = new Lang.Class({
     },
 
     actionMoveWorkspaceRight: function() {
-        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
         let activeWorkspaceIndex = global.screen.get_active_workspace_index();
         let indexToActivate = activeWorkspaceIndex;
         if (rtl && activeWorkspaceIndex > 0)

js/ui/workspace.js

@@ -23,6 +23,8 @@ const WINDOW_DND_SIZE = 256;
 
 const SCROLL_SCALE_AMOUNT = 100 / 5;
 
+const WINDOW_CLONE_MAXIMUM_SCALE = 0.7;
+
 const LIGHTBOX_FADE_TIME = 0.1;
 const CLOSE_BUTTON_FADE_TIME = 0.1;
 
@@ -368,6 +370,7 @@ const WindowClone = new Lang.Class({
                     if (this._selected)
                         return;
                     let [x, y] = action.get_coords();
+                    action.release();
                     this._draggable.startDrag(x, y, global.get_current_time());
                 }));
         }
@@ -525,7 +528,7 @@ const WindowOverlay = new Lang.Class({
 
         let settings = new Gio.Settings({ schema: BUTTON_LAYOUT_SCHEMA });
         let layout = settings.get_string(BUTTON_LAYOUT_KEY);
-        let rtl = St.Widget.get_default_direction() == St.TextDirection.RTL;
+        let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
 
         let split = layout.split(":");
         let side;
@@ -964,7 +967,7 @@ const Workspace = new Lang.Class({
 
         let scale = Math.min((width - buttonOuterWidth) / rect.width,
                              (height - buttonOuterHeight - captionHeight) / rect.height,
-                             1.0);
+                             WINDOW_CLONE_MAXIMUM_SCALE);
 
         x = Math.floor(x + (width - scale * rect.width) / 2);
 
@@ -1118,26 +1121,6 @@ const Workspace = new Lang.Class({
         }
     },
 
-    _showAllOverlays: function() {
-        let currentWorkspace = global.screen.get_active_workspace();
-        for (let i = 0; i < this._windows.length; i++) {
-            let clone = this._windows[i];
-            let overlay = this._windowOverlays[i];
-            this._showWindowOverlay(clone, overlay,
-                                    this.metaWorkspace == null || this.metaWorkspace == currentWorkspace);
-        }
-    },
-
-    _hideAllOverlays: function() {
-        for (let i = 0; i < this._windows.length; i++) {
-            let clone = this._windows[i];
-            Tweener.removeTweens(clone.actor);
-            let overlay = this._windowOverlays[i];
-            if (overlay)
-                overlay.hide();
-        }
-    },
-
     _delayedWindowRepositioning: function() {
         if (this._windowIsZooming)
             return true;
@@ -1155,6 +1138,12 @@ const Workspace = new Lang.Class({
             return true;
         }
 
+        let actorUnderPointer = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
+        for (let i = 0; i < this._windows.length; i++) {
+            if (this._windows[i].actor == actorUnderPointer)
+                return true;
+        }
+
         this.positionWindows(WindowPositionFlags.ANIMATE);
         return false;
     },
@@ -1243,7 +1232,7 @@ const Workspace = new Lang.Class({
         if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
             return;
 
-        let clone = this._addWindowClone(win);
+        let [clone, overlay] = this._addWindowClone(win);
 
         if (win._overviewHint) {
             let x = win._overviewHint.x - this.actor.x;
@@ -1253,6 +1242,7 @@ const Workspace = new Lang.Class({
 
             clone.actor.set_position (x, y);
             clone.actor.set_scale (scale, scale);
+            this._updateWindowOverlayPositions(clone, overlay, x, y, scale, false);
         } else {
             // Position new windows at the top corner of the workspace rather
             // than where they were placed for real to avoid the window
@@ -1312,7 +1302,10 @@ const Workspace = new Lang.Class({
 
         this.leavingOverview = true;
 
-        this._hideAllOverlays();
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            Tweener.removeTweens(clone.actor);
+        }
 
         if (this._repositionWindowsId > 0) {
             Mainloop.source_remove(this._repositionWindowsId);
@@ -1327,6 +1320,10 @@ const Workspace = new Lang.Class({
         // Position and scale the windows.
         for (let i = 0; i < this._windows.length; i++) {
             let clone = this._windows[i];
+            let overlay = this._windowOverlays[i];
+
+            if (overlay)
+                overlay.hide();
 
             clone.zoomFromOverview();
 
@@ -1351,7 +1348,6 @@ const Workspace = new Lang.Class({
                                  });
             }
         }
-
     },
 
     destroy : function() {
@@ -1442,7 +1438,7 @@ const Workspace = new Lang.Class({
         this._windows.push(clone);
         this._windowOverlays.push(overlay);
 
-        return clone;
+        return [clone, overlay];
     },
 
     _onShowOverlayClose: function (windowOverlay) {

js/ui/workspaceSwitcherPopup.js

@@ -19,12 +19,12 @@ const WorkspaceSwitcherPopup = new Lang.Class({
     Name: 'WorkspaceSwitcherPopup',
 
     _init : function() {
-        this.actor = new St.Group({ reactive: true,
-                                         x: 0,
-                                         y: 0,
-                                         width: global.screen_width,
-                                         height: global.screen_height,
-                                         style_class: 'workspace-switcher-group' });
+        this.actor = new St.Widget({ reactive: true,
+                                     x: 0,
+                                     y: 0,
+                                     width: global.screen_width,
+                                     height: global.screen_height,
+                                     style_class: 'workspace-switcher-group' });
         Main.uiGroup.add_actor(this.actor);
 
         this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
@@ -105,7 +105,7 @@ const WorkspaceSwitcherPopup = new Lang.Class({
     },
 
     _redraw : function(direction, activeWorkspaceIndex) {
-        this._list.destroy_children();
+        this._list.destroy_all_children();
 
         for (let i = 0; i < global.screen.n_workspaces; i++) {
             let indicator = null;

js/ui/workspaceThumbnail.js

@@ -25,6 +25,8 @@ const SLIDE_ANIMATION_TIME = 0.2;
 // placeholder exactly.
 const WORKSPACE_CUT_SIZE = 10;
 
+const WORKSPACE_KEEP_ALIVE_TIME = 100;
+
 const WindowClone = new Lang.Class({
     Name: 'WindowClone',
 
@@ -154,24 +156,16 @@ const WorkspaceThumbnail = new Lang.Class({
         this.metaWorkspace = metaWorkspace;
         this.monitorIndex = Main.layoutManager.primaryIndex;
 
-        this.actor = new St.Group({ reactive: true,
-                                    clip_to_allocation: true,
-                                    style_class: 'workspace-thumbnail' });
+        this._removed = false;
+
+        this.actor = new St.Widget({ clip_to_allocation: true,
+                                     style_class: 'workspace-thumbnail' });
         this.actor._delegate = this;
 
         this._contents = new Clutter.Group();
         this.actor.add_actor(this._contents);
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('button-press-event', Lang.bind(this,
-            function(actor, event) {
-                return true;
-            }));
-        this.actor.connect('button-release-event', Lang.bind(this,
-            function(actor, event) {
-                this._activate();
-                return true;
-            }));
 
         this._background = Meta.BackgroundActor.new_for_screen(global.screen);
         this._contents.add_actor(this._background);
@@ -179,17 +173,21 @@ const WorkspaceThumbnail = new Lang.Class({
         let monitor = Main.layoutManager.primaryMonitor;
         this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
 
-        let windows = global.get_window_actors().filter(this._isMyWindow, this);
+        let windows = global.get_window_actors().filter(this._isWorkspaceWindow, this);
 
         // Create clones for windows that should be visible in the Overview
         this._windows = [];
+        this._allWindows = [];
+        this._minimizedChangedIds = [];
         for (let i = 0; i < windows.length; i++) {
-            windows[i].meta_window._minimizedChangedId =
+            let minimizedChangedId =
                 windows[i].meta_window.connect('notify::minimized',
                                                Lang.bind(this,
                                                          this._updateMinimized));
+            this._allWindows.push(windows[i].meta_window);
+            this._minimizedChangedIds.push(minimizedChangedId);
 
-            if (this._isOverviewWindow(windows[i])) {
+            if (this._isMyWindow(windows[i]) && this._isOverviewWindow(windows[i])) {
                 this._addWindowClone(windows[i]);
             }
         }
@@ -274,17 +272,11 @@ const WorkspaceThumbnail = new Lang.Class({
         let clone = this._windows[index];
         this._windows.splice(index, 1);
 
-        if (win && this._isOverviewWindow(win)) {
-            if (metaWin._minimizedChangedId) {
-                metaWin.disconnect(metaWin._minimizedChangedId);
-                delete metaWin._minimizedChangedId;
-            }
-        }
         clone.destroy();
     },
 
     _doAddWindow : function(metaWin) {
-        if (this.leavingOverview)
+        if (this._removed)
             return;
 
         let win = metaWin.get_compositor_private();
@@ -294,7 +286,7 @@ const WorkspaceThumbnail = new Lang.Class({
             // the compositor finds out about them...
             Mainloop.idle_add(Lang.bind(this,
                                         function () {
-                                            if (this.actor &&
+                                            if (!this._removed &&
                                                 metaWin.get_compositor_private() &&
                                                 metaWin.get_workspace() == this.metaWorkspace)
                                                 this._doAddWindow(metaWin);
@@ -303,16 +295,19 @@ const WorkspaceThumbnail = new Lang.Class({
             return;
         }
 
+        if (this._allWindows.indexOf(metaWin) == -1) {
+            let minimizedChangedId = metaWin.connect('notify::minimized',
+                                                     Lang.bind(this,
+                                                               this._updateMinimized));
+            this._allWindows.push(metaWin);
+            this._minimizedChangedIds.push(minimizedChangedId);
+        }
+
         // We might have the window in our list already if it was on all workspaces and
         // now was moved to this workspace
         if (this._lookupIndex (metaWin) != -1)
             return;
 
-        if (!metaWin._minimizedChangedId)
-            metaWin._minimizedChangedId = metaWin.connect('notify::minimized',
-                                                          Lang.bind(this,
-                                                                    this._updateMinimized));
-
         if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
             return;
 
@@ -324,6 +319,13 @@ const WorkspaceThumbnail = new Lang.Class({
     },
 
     _windowRemoved : function(metaWorkspace, metaWin) {
+        let index = this._allWindows.indexOf(metaWin);
+        if (index != -1) {
+            metaWin.disconnect(this._minimizedChangedIds[index]);
+            this._allWindows.splice(index, 1);
+            this._minimizedChangedIds.splice(index, 1);
+        }
+
         this._doRemoveWindow(metaWin);
     },
 
@@ -350,27 +352,36 @@ const WorkspaceThumbnail = new Lang.Class({
         this.actor.destroy();
     },
 
-    _onDestroy: function(actor) {
+    workspaceRemoved : function() {
+        if (this._removed)
+            return;
+
+        this._removed = true;
+
         this.metaWorkspace.disconnect(this._windowAddedId);
         this.metaWorkspace.disconnect(this._windowRemovedId);
         global.screen.disconnect(this._windowEnteredMonitorId);
         global.screen.disconnect(this._windowLeftMonitorId);
 
-        for (let i = 0; i < this._windows.length; i++) {
-            let metaWin = this._windows[i].metaWindow;
-            if (metaWin._minimizedChangedId) {
-                metaWin.disconnect(metaWin._minimizedChangedId);
-                delete metaWin._minimizedChangedId;
-            }
-        }
+        for (let i = 0; i < this._allWindows.length; i++)
+            this._allWindows[i].disconnect(this._minimizedChangedIds[i]);
+    },
+
+    _onDestroy: function(actor) {
+        this.workspaceRemoved();
 
         this._windows = [];
         this.actor = null;
     },
 
+    // Tests if @win belongs to this workspace
+    _isWorkspaceWindow : function (win) {
+        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index());
+    },
+
     // Tests if @win belongs to this workspace and monitor
     _isMyWindow : function (win) {
-        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index()) &&
+        return this._isWorkspaceWindow(win) &&
             (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
     },
 
@@ -386,7 +397,9 @@ const WorkspaceThumbnail = new Lang.Class({
         let clone = new WindowClone(win);
 
         clone.connect('selected',
-                      Lang.bind(this, this._activate));
+                      Lang.bind(this, function(clone, time) {
+                          this.activate(time);
+                      }));
         clone.connect('drag-begin',
                       Lang.bind(this, function(clone) {
                           Main.overview.beginWindowDrag();
@@ -411,7 +424,7 @@ const WorkspaceThumbnail = new Lang.Class({
         return clone;
     },
 
-    _activate : function (clone, time) {
+    activate : function (time) {
         if (this.state > ThumbnailState.NORMAL)
             return;
 
@@ -422,8 +435,8 @@ const WorkspaceThumbnail = new Lang.Class({
             this.metaWorkspace.activate(time);
     },
 
-    // Draggable target interface
-    handleDragOver : function(source, actor, x, y, time) {
+    // Draggable target interface used only by ThumbnailsBox
+    handleDragOverInternal : function(source, time) {
         if (source == Main.xdndHandler) {
             this.metaWorkspace.activate(time);
             return DND.DragMotionResult.CONTINUE;
@@ -432,11 +445,6 @@ const WorkspaceThumbnail = new Lang.Class({
         if (this.state > ThumbnailState.NORMAL)
             return DND.DragMotionResult.CONTINUE;
 
-        let [w, h] = this.actor.get_transformed_size();
-        // Bubble up if we're in the "workspace cut".
-        if (y < WORKSPACE_CUT_SIZE || y > h - WORKSPACE_CUT_SIZE)
-            return DND.DragMotionResult.CONTINUE;
-
         if (source.realWindow && !this._isMyWindow(source.realWindow))
             return DND.DragMotionResult.MOVE_DROP;
         if (source.shellWorkspaceLaunch)
@@ -445,7 +453,7 @@ const WorkspaceThumbnail = new Lang.Class({
         return DND.DragMotionResult.CONTINUE;
     },
 
-    acceptDrop : function(source, actor, x, y, time) {
+    acceptDropInternal : function(source, time) {
         if (this.state > ThumbnailState.NORMAL)
             return false;
 
@@ -483,7 +491,8 @@ const ThumbnailsBox = new Lang.Class({
     Name: 'ThumbnailsBox',
 
     _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'workspace-thumbnails',
+        this.actor = new Shell.GenericContainer({ reactive: true,
+                                                  style_class: 'workspace-thumbnails',
                                                   request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
@@ -512,6 +521,7 @@ const ThumbnailsBox = new Lang.Class({
         this._indicator = indicator;
         this.actor.add_actor(indicator);
 
+        this._dropWorkspace = -1;
         this._dropPlaceholderPos = -1;
         this._dropPlaceholder = new St.Bin({ style_class: 'placeholder' });
         this.actor.add_actor(this._dropPlaceholder);
@@ -528,83 +538,187 @@ const ThumbnailsBox = new Lang.Class({
             this._stateCounts[ThumbnailState[key]] = 0;
 
         this._thumbnails = [];
+
+        this.actor.connect('button-press-event', function() { return true; });
+        this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
+
+        Main.overview.connect('item-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('item-drag-end',
+                              Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('item-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+        Main.overview.connect('window-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('window-drag-end',
+                              Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('window-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+    },
+
+    _onButtonRelease: function(actor, event) {
+        let [stageX, stageY] = event.get_coords();
+        let [r, x, y] = this.actor.transform_stage_point(stageX, stageY);
+
+        for (let i = 0; i < this._thumbnails.length; i++) {
+            let thumbnail = this._thumbnails[i]
+            let [w, h] = thumbnail.actor.get_transformed_size();
+            if (y >= thumbnail.actor.y && y <= thumbnail.actor.y + h) {
+                thumbnail.activate(event.time);
+                break;
+            }
+        }
+
+        return true;
+    },
+
+    _onDragBegin: function() {
+        this._dragCancelled = false;
+        this._dragMonitor = {
+            dragMotion: Lang.bind(this, this._onDragMotion)
+        };
+        DND.addDragMonitor(this._dragMonitor);
+    },
+
+    _onDragEnd: function() {
+        if (this._dragCancelled)
+            return;
+
+        this._endDrag();
+    },
+
+    _onDragCancelled: function() {
+        this._dragCancelled = true;
+        this._endDrag();
+    },
+
+    _endDrag: function() {
+        this._clearDragPlaceholder();
+        DND.removeDragMonitor(this._dragMonitor);
+    },
+
+    _onDragMotion: function(dragEvent) {
+        if (!this.actor.contains(dragEvent.targetActor))
+            this._onLeave();
+        return DND.DragMotionResult.CONTINUE;
+    },
+
+    _onLeave: function() {
+        this._clearDragPlaceholder();
+    },
+
+    _clearDragPlaceholder: function() {
+        if (this._dropPlaceholderPos == -1)
+            return;
+
+        this._dropPlaceholderPos = -1;
+        this.actor.queue_relayout();
     },
 
     // Draggable target interface
     handleDragOver : function(source, actor, x, y, time) {
-        if (!source.realWindow && !source.shellWorkspaceLaunch)
+        if (!source.realWindow && !source.shellWorkspaceLaunch && source != Main.xdndHandler)
+            return DND.DragMotionResult.CONTINUE;
+
+        if (!Meta.prefs_get_dynamic_workspaces())
             return DND.DragMotionResult.CONTINUE;
 
         let spacing = this.actor.get_theme_node().get_length('spacing');
-        let thumbHeight = this._porthole.height * this._scale;
-
-        let workspace = -1;
-        let firstThumbY = this._thumbnails[0].actor.y;
-        for (let i = 0; i < this._thumbnails.length; i ++) {
-            let targetBase = firstThumbY + (thumbHeight + spacing) * i;
 
+        this._dropWorkspace = -1;
+        let placeholderPos = -1;
+        let targetBase;
+        if (this._dropPlaceholderPos == 0)
+            targetBase = this._dropPlaceholder.y;
+        else
+            targetBase = this._thumbnails[0].actor.y;
+        let targetTop = targetBase - spacing - WORKSPACE_CUT_SIZE;
+        let length = this._thumbnails.length;
+        for (let i = 0; i < length; i ++) {
             // Allow the reorder target to have a 10px "cut" into
             // each side of the thumbnail, to make dragging onto the
             // placeholder easier
-            let targetTop = targetBase - spacing - WORKSPACE_CUT_SIZE;
+            let [w, h] = this._thumbnails[i].actor.get_transformed_size();
             let targetBottom = targetBase + WORKSPACE_CUT_SIZE;
+            let nextTargetBase = targetBase + h + spacing;
+            let nextTargetTop =  nextTargetBase - spacing - ((i == length - 1) ? 0: WORKSPACE_CUT_SIZE);
 
             // Expand the target to include the placeholder, if it exists.
             if (i == this._dropPlaceholderPos)
                 targetBottom += this._dropPlaceholder.get_height();
 
-            if (y > targetTop && y <= targetBottom) {
-                workspace = i;
+            if (y > targetTop && y <= targetBottom && source != Main.xdndHandler) {
+                placeholderPos = i;
                 break;
+            } else if (y > targetBottom && y <= nextTargetTop) {
+                this._dropWorkspace = i;
+                break
             }
+
+            targetBase = nextTargetBase;
+            targetTop = nextTargetTop;
         }
 
-        this._dropPlaceholderPos = workspace;
-        this.actor.queue_relayout();
+        if (this._dropPlaceholderPos != placeholderPos) {
+            this._dropPlaceholderPos = placeholderPos;
+            this.actor.queue_relayout();
+        }
 
-        if (workspace == -1)
+        if (this._dropWorkspace != -1)
+            return this._thumbnails[this._dropWorkspace].handleDragOverInternal(source, time);
+        else if (this._dropPlaceholderPos != -1)
+            return source.realWindow ? DND.DragMotionResult.MOVE_DROP : DND.DragMotionResult.COPY_DROP;
+        else
             return DND.DragMotionResult.CONTINUE;
-
-        return DND.DragMotionResult.MOVE_DROP;
     },
 
     acceptDrop: function(source, actor, x, y, time) {
-        if (this._dropPlaceholderPos == -1)
-            return false;
+        if (this._dropWorkspace != -1) {
+            return this._thumbnails[this._dropWorkspace].acceptDropInternal(source, time);
+        } else if (this._dropPlaceholderPos != -1) {
+            if (!source.realWindow && !source.shellWorkspaceLaunch)
+                return false;
 
-        if (!source.realWindow && !source.shellWorkspaceLaunch)
-            return false;
+            let isWindow = !!source.realWindow;
 
-        let isWindow = !!source.realWindow;
+            // To create a new workspace, we first slide all the windows on workspaces
+            // below us to the next workspace, leaving a blank workspace for us to recycle.
+            let newWorkspaceIndex;
+            [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
 
-        // To create a new workspace, we first slide all the windows on workspaces
-        // below us to the next workspace, leaving a blank workspace for us to recycle.
-        let newWorkspaceIndex;
-        [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
+            // Nab all the windows below us.
+            let windows = global.get_window_actors().filter(function(win) {
+                if (isWindow)
+                    return win.get_workspace() >= newWorkspaceIndex && win != source;
+                else
+                    return win.get_workspace() >= newWorkspaceIndex;
+            });
+
+            // ... move them down one.
+            windows.forEach(function(win) {
+                win.meta_window.change_workspace_by_index(win.get_workspace() + 1,
+                                                          true, time);
+            });
 
-        // Nab all the windows below us.
-        let windows = global.get_window_actors().filter(function(win) {
             if (isWindow)
-                return win.get_workspace() >= newWorkspaceIndex && win != source;
-            else
-                return win.get_workspace() >= newWorkspaceIndex;
-        });
+                // ... and bam, a workspace, good as new.
+                source.metaWindow.change_workspace_by_index(newWorkspaceIndex,
+                                                            true, time);
+            else if (source.shellWorkspaceLaunch) {
+                source.shellWorkspaceLaunch({ workspace: newWorkspaceIndex,
+                                              timestamp: time });
+                // This new workspace will be automatically removed if the application fails
+                // to open its first window within some time, as tracked by Shell.WindowTracker.
+                // Here, we only add a very brief timeout to avoid the _immediate_ removal of the
+                // workspace while we wait for the startup sequence to load.
+                Main.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
+                                        WORKSPACE_KEEP_ALIVE_TIME);
+            }
 
-        // ... move them down one.
-        windows.forEach(function(win) {
-            win.meta_window.change_workspace_by_index(win.get_workspace() + 1,
-                                                      true, time);
-        });
-
-        if (isWindow)
-            // ... and bam, a workspace, good as new.
-            source.metaWindow.change_workspace_by_index(newWorkspaceIndex,
-                                                        true, time);
-        else if (source.shellWorkspaceLaunch)
-            source.shellWorkspaceLaunch({ workspace: newWorkspaceIndex,
-                                          timestamp: time });
-
-        return true;
+            return true;
+        } else {
+            return false;
+        }
     },
 
     show: function() {
@@ -679,8 +793,10 @@ const ThumbnailsBox = new Lang.Class({
             if (thumbnail.state > ThumbnailState.NORMAL)
                 continue;
 
-            if (currentPos >= start && currentPos < start + count)
+            if (currentPos >= start && currentPos < start + count) {
+                thumbnail.workspaceRemoved();
                 this._setThumbnailState(thumbnail, ThumbnailState.REMOVING);
+            }
 
             currentPos++;
         }
@@ -869,7 +985,7 @@ const ThumbnailsBox = new Lang.Class({
     },
 
     _allocate: function(actor, box, flags) {
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
 
         // See comment about this._background in _init()
         let themeNode = this._background.get_theme_node();

js/ui/workspacesView.js

@@ -29,7 +29,7 @@ const WorkspacesView = new Lang.Class({
     Name: 'WorkspacesView',
 
     _init: function(workspaces) {
-        this.actor = new St.Group({ style_class: 'workspaces-view' });
+        this.actor = new St.Widget({ style_class: 'workspaces-view' });
 
         // The actor itself isn't a drop target, so we don't want to pick on its area
         this.actor.set_size(0, 0);
@@ -509,6 +509,7 @@ const WorkspacesDisplay = new Lang.Class({
         this._inDrag = false;
         this._cancelledDrag = false;
 
+        this._controlsInitiallyHovered = false;
         this._alwaysZoomOut = false;
         this._zoomOut = false;
         this._zoomFraction = 0;
@@ -528,9 +529,11 @@ const WorkspacesDisplay = new Lang.Class({
             this._updateAlwaysZoom();
         }));
 
+        global.screen.connect('notify::n-workspaces',
+                              Lang.bind(this, this._workspacesChanged));
+
         this._switchWorkspaceNotifyId = 0;
 
-        this._nWorkspacesChangedId = 0;
         this._itemDragBeginId = 0;
         this._itemDragCancelledId = 0;
         this._itemDragEndId = 0;
@@ -543,6 +546,19 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     show: function() {
+        if(!this._alwaysZoomOut) {
+            let [mouseX, mouseY] = global.get_pointer();
+            let [x, y] = this._controls.get_transformed_position();
+            let [width, height] = this._controls.get_transformed_size();
+            let visibleWidth = this._controls.get_theme_node().get_length('visible-width');
+            let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
+            if(rtl)
+                x = x + width - visibleWidth;
+            if(mouseX > x - 0.5 && mouseX < x + visibleWidth + 0.5 &&
+               mouseY > y - 0.5 && mouseY < y + height + 0.5)
+                this._controlsInitiallyHovered = true;
+        }
+
         this._zoomOut = this._alwaysZoomOut;
         this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
         this._updateZoom();
@@ -556,9 +572,6 @@ const WorkspacesDisplay = new Lang.Class({
             global.screen.connect('restacked',
                                   Lang.bind(this, this._onRestacked));
 
-        if (this._nWorkspacesChangedId == 0)
-            this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
-                                                               Lang.bind(this, this._workspacesChanged));
         if (this._itemDragBeginId == 0)
             this._itemDragBeginId = Main.overview.connect('item-drag-begin',
                                                           Lang.bind(this, this._dragBegin));
@@ -591,6 +604,9 @@ const WorkspacesDisplay = new Lang.Class({
         this._controls.hide();
         this._thumbnailsBox.hide();
 
+        if (!this._alwaysZoomOut)
+            this.zoomFraction = 0;
+
         if (this._restackedNotifyId > 0){
             global.screen.disconnect(this._restackedNotifyId);
             this._restackedNotifyId = 0;
@@ -790,7 +806,7 @@ const WorkspacesDisplay = new Lang.Class({
         let controlsVisible = this._controls.get_theme_node().get_length('visible-width');
         let controlsReserved = controlsVisible * (1 - this._zoomFraction) + controlsNatural * this._zoomFraction;
 
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
         if (rtl) {
             childBox.x2 = controlsReserved;
             childBox.x1 = childBox.x2 - controlsNatural;
@@ -827,10 +843,7 @@ const WorkspacesDisplay = new Lang.Class({
                         if (!primaryView)
                             return;
                         primaryView.actor.opacity = opacity;
-                        if (opacity == 0)
-                            primaryView.actor.hide();
-                        else
-                            primaryView.actor.show();
+                        primaryView.actor.visible = opacity != 0;
                     }));
         }));
     },
@@ -850,7 +863,7 @@ const WorkspacesDisplay = new Lang.Class({
 
         let [x, y] = this.actor.get_transformed_position();
 
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
 
         let clipWidth = width - controlsVisible;
         let clipHeight = (fullHeight / fullWidth) * clipWidth;
@@ -911,19 +924,16 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _workspacesChanged: function() {
-        let oldNumWorkspaces = this._workspaces[0].length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
-
-        if (oldNumWorkspaces == newNumWorkspaces)
-            return;
-
         this._updateAlwaysZoom();
         this._updateZoom();
 
         if (this._workspacesViews == null)
             return;
 
+        let oldNumWorkspaces = this._workspaces[0].length;
+        let newNumWorkspaces = global.screen.n_workspaces;
+        let active = global.screen.get_active_workspace_index();
+
         let lostWorkspaces = [];
         if (newNumWorkspaces > oldNumWorkspaces) {
             let monitors = Main.layoutManager.monitors;
@@ -996,7 +1006,10 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _onControlsHoverChanged: function() {
-        this._updateZoom();
+        if(!this._controls.hover)
+            this._controlsInitiallyHovered = false;
+        if(!this._controlsInitiallyHovered)
+            this._updateZoom();
     },
 
     _dragBegin: function() {

js/ui/xdndHandler.js

@@ -17,6 +17,7 @@ const XdndHandler = new Lang.Class({
         // Used as a drag actor in case we don't have a cursor window clone
         this._dummy = new Clutter.Rectangle({ width: 1, height: 1, opacity: 0 });
         global.stage.add_actor(this._dummy);
+        Shell.util_set_hidden_from_pick(this._dummy, true);
         this._dummy.hide();
 
         // Mutter delays the creation of the output window as long
@@ -112,10 +113,11 @@ const XdndHandler = new Lang.Class({
 
         while (pickedActor) {
                 if (pickedActor._delegate && pickedActor._delegate.handleDragOver) {
+                    let [r, targX, targY] = pickedActor.transform_stage_point(x, y);
                     let result = pickedActor._delegate.handleDragOver(this,
                                                                       dragEvent.dragActor,
-                                                                      x,
-                                                                      y,
+                                                                      targX,
+                                                                      targY,
                                                                       global.get_current_time());
                     if (result != DND.DragMotionResult.CONTINUE)
                         return;

po/LINGUAS

@@ -30,11 +30,13 @@ hu
 id
 it
 ja
-ko
+kk
 kn
+ko
 ku
 lt
 lv
+ml
 mk
 mr
 ms
@@ -48,6 +50,7 @@ pt
 pt_BR
 ro
 ru
+si
 sk
 sl
 sr

po/POTFILES.in

@@ -1,5 +1,7 @@
 data/gnome-shell.desktop.in.in
-data/org.gnome.shell.gschema.xml.in
+data/gnome-shell-extension-prefs.desktop.in.in
+data/org.gnome.shell.gschema.xml.in.in
+js/extensionPrefs/main.js
 js/gdm/loginDialog.js
 js/gdm/powerMenu.js
 js/misc/util.js
@@ -10,11 +12,13 @@ js/ui/calendar.js
 js/ui/contactDisplay.js
 js/ui/dash.js
 js/ui/dateMenu.js
-js/ui/docDisplay.js
 js/ui/endSessionDialog.js
+js/ui/extensionDownloader.js
 js/ui/extensionSystem.js
 js/ui/keyboard.js
+js/ui/keyringPrompt.js
 js/ui/lookingGlass.js
+js/ui/main.js
 js/ui/messageTray.js
 js/ui/networkAgent.js
 js/ui/notificationDaemon.js
@@ -43,6 +47,7 @@ src/main.c
 src/shell-app.c
 src/shell-app-system.c
 src/shell-global.c
+src/shell-keyring-prompt.c
 src/shell-mobile-providers.c
 src/shell-polkit-authentication-agent.c
 src/shell-util.c

po/POTFILES.skip

@@ -1,2 +1,3 @@
 data/gnome-shell.desktop.in
-data/gnome-shell-clock-preferences.desktop.in
+data/gnome-shell-extension-prefs.desktop.in
+data/org.gnome.shell.evolution.calendar.gschema.xml.in