Bump version to 3.6.2

Update NEWS

.gitignore

@@ -38,7 +38,6 @@ docs/reference/*/*.txt
 docs/reference/*/*.types
 docs/reference/*/html/
 docs/reference/*/xml/
-docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
 intltool-extract.in
@@ -86,8 +85,6 @@ src/test-theme
 src/st.h
 src/stamp-st.h
 src/stamp-st.h.tmp
-src/st-scroll-view-fade-generated.c
-src/stamp-st-scroll-view-fade-generated.c
 stamp-h1
 tests/run-test.sh
 xmldocs.make

.gitmodules

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

Makefile.am

@@ -16,7 +16,6 @@ EXTRA_DIST =		\
 # These are files checked into Git that we don't want to distribute
 DIST_EXCLUDE =					\
 	.gitignore				\
-	.gitmodules				\
 	gnome-shell.doap			\
 	HACKING					\
 	MAINTAINERS				\

NEWS

@@ -1,203 +1,34 @@
-3.7.4.1
-=======
-* userMenu: Use show-full-name-in-top-bar setting [Bastien; #689561]
-* dateMenu: Add "Open Clocks" entry [Mathieu; #644390]
-* screenshot: Immediately show the flash spot [Jasper; #691875]
-* Misc. bug fixes [Rico, Jeremy]
-
-Contributors:
-  Jeremy Bicha, Mathieu Bridon, Bastien Nocera, Jasper St. Pierre,
-  Rico Tzschichholz
-
-Translations:
-  Ihar Hrachyshka [be]
-
-3.7.4
+3.6.2
 =====
-* Make menu separators crisp [Giovanni, Allan; #641745]
-* power: Update for new D-Bus name [Bastien; #690506]
-* Add smooth scrolling support [Jasper; #687573]
-* Tweak notification layout [Allan; #688506]
-* Ping the active window when using the app menu [Giovanni; #684340]
-* Make password entries insensitive after submission [Jasper; #690594, #690895]
-* Honor lock-delay GSettings key [Giovanni, Matthias; #690766, #691170]
-* Use text/calendar preferred app as the calendar app [Giovanni; #690767]
-* lookingGlass: Move to an inspect() function [Jasper; #690726]
-* Make OSK animation quicker, snappier [Rui; #688642]
-* Allow to close chat notifications with Escape [Jasper; #690897]
-* Honor org.gnome.desktop.screensaver.user-switch-enabled [Giovanni; #691042]
-* Add a SelectArea() DBus method [Cosimo; #687954]
-* Support non-absolute paths when saving screenshots [Cosimo; #688004]
-* OSK: Fix extended keys popups [Rui; #674955]
-* Don't hide or show the keyboard immediately [Rui; #688646]
-* Improve padding in power menu [Giovanni; #689297]
-* Add per-window input source switching [Rui; #691414]
-* Misc bug fixes and cleanups [Rico, Jasper, Giovanni, Rui, Florian, Dan;
-  #690608, #690589, #690539, #687081, #690667, #690665, #690666, #685856,
-  #690858, #690895, #680414, #690965, #691019, #690590, #681376, #690180,
-  #685513, #689263, #691553, #691720, #691743, #691750]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Allan Day, Rui Matos,
-  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz,
-  Dan Winship
-
-Translations:
-  Matej Urbančič [sl], Kjartan Maraas [nb], Mattias Põldaru [et],
-  Yaron Shahrabani [he], Aurimas Černius [lt], Khaled Hosny [ar],
-  Fran Diéguez [gl], Daniel Mustieles [es], Piotr Drąg [pl], Balázs Úr [hu],
-  Baurzhan Muftakhidinov [kk], Tobias Endrigkeit [de], Dušan Kazik [sk],
-  Aron Xu [zh_CN], Gheyret Kenji [ug]
-
-3.7.3
-=====
-* Add 'No Messages' label when message tray is empty [Victoria; #686738]
-* Use better icons in Ctrl-Alt-Tab popup [Stéphane; #641303]
-* Show the OSK on the monitor where the focused window lives [Giovanni; #685856]
-* Highlight window clone and caption when hovered [Giovanni, Marc; #665310]
-* Improve login process indication [Stéphane; #687113]
-* Omit empty categories in apps view [Stéphane; #687970]
-* Style panel differently according to mode [Florian; #684573]
-* Make it possible to hide the user name [Matthias; #688577]
-* Consolidate and improve chat connection notifications [Giovanni; #687213]
-* Improve notification scrollbar appearance [Carlos; #688393]
-* Fade scroll view fade near scrolling edges [Jasper; #689249]
-* Add a read-only org.gnome.Shell.Mode property [Debarshi; #689300]
-* Don't close message tray after using context menus [Giovanni; #689296]
-* Port swipe-scrolling to ClutterPanAction [Jasper, Florian; #689062, #689552]
-* Remember state of 'Remember Password' checkbox [Ron; #688039]
-* Improve timestamp format in chat notifications [Carlos; #680989]
-* Improve style of missed-messages counter [Carlos; #686472]
-* Omit connection failure notifications if cancelled by user [Giovanni; #684823]
-* Add window-based Alt-Tab popup [Florian; #688913]
-* Support external session mode definitions [Florian; #689304]
-* Support session-mode-specific extensions [Florian; #689305]
-* Support 'parentMode' property in session modes [Florian; #689308]
-* Support a new org.gnome.ShellSearchProvider2 DBus interface
-  [Cosimo; #689735, #690009]
-* Add "windows" to Ctrl-Alt-Tab popup [Jasper; #689653]
-* Port PopupMenu to GrabHelper [Jasper; #689109, #689954]
-* Show headphone icon when headphones are plugged in [Giovanni; #675902]
-* Display (non-app) search results as list [Tanner, Cosimo; #681797]
-* Skip diacritical marks in search terms [Aleksander; #648587]
-* Expose all engine options in input sources [Giovanni, Rui; #682318]
-* Add input source switcher popup [Rui; #682315]
-* Add minimal support for InfiniBand in network menu [Dan; #677150]
-* Misc bug fixes and cleanups [Sebastian, Aleksander, Giovanni, Tim, Cosimo,
-  Florian, Matthias, Rui, Lionel, Colin, Piotr, Guillaume, Bastien, Tanner,
-  Carlos, Stéphane, Jakub; #688422, #688379, #688750, #688771, #686800,
-  #688133, #688895, #688966, #683986, #688004, #689108, #689029, #683449,
-  #688196, #689304, #689243, #689295, #689325, #689400, #679168, #689568,
-  #689537, #689528, #689749, #689789, #689353, #689820, #689868, #689778,
-  #689959, #688589, #688589, #689955, #687250, #689965, #690046, #690049,
-  #689884, #682286, #690173, #690174, #672941, #689876, #687881, #690171,
-  #690241, #690312, #690175, #687955, #650843, #688234, #690427
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Stéphane Démurget,
-  Guillaume Desmottes, Tanner Doshier, Piotr Drąg, Sebastian Keller,
-  Lionel Landwerlin, Tim Lunn, Victoria Martínez de la Cruz, Aleksander Morgado,
-  Florian Müllner, Bastien Nocera, Marc Plano-Lesay, Carlos Soriano Sánchez,
-  Jakub Steiner, Jasper St. Pierre, Colin Walters, Dan Winship, Ron Yorston
-
-Translations:
-  Yuri Myasoedov [ru], Wouter Bolsterlee [nl], Yaron Shahrabani [he],
-  Nilamdyuti Goswami [as], Ani Peter [ml], Kjartan Maraas [nb],
-  Dr.T.Vasudevan [ta], A S Alam [pa], Shankar Prasad [kn], Khaled Hosny [ar],
-  Daniel Mustieles [es], Dušan Kazik [sk]
-
-3.7.2
-=====
-* Enforce RTL in he for messages that might end up as LTR [Florian; #686630]
-* gdm: Move logo into the panel [Florian; #685852]
-* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
+* Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
+* Set Empathy as preferred handler when delegating channels [Xavier; #686296]
 * Tweak screenShield animations [Rui; #686745]
 * Restore Fittsability of summary items in message tray [Florian; #686474]
-* Save screencasts as recent item [Ray; #680647]
-* overview: Resize window captions on content change [Giovanni, Alex; #620874]
 * App search: Match GenericName too [Matthias; #687121]
-* runDialog: Better match style of other modal dialogs [Florian, Allan; #687127]
-* Improve the button insensitive style [Stéphane; #687110]
-* network: Don't use a global switch for all VPN connections [Giovanni; #682929]
-* appMenu: Update on icon theme changes [Florian; #687224]
-* Show 'Log out' in more situations [Matthias; #686736]
-* Add a setting to force the 'Log out' menuitem [Matthias; #686057]
-* overview: Improve styling of search box [Stéphane; #686479]
-* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Add setting to force log out menuitem [Matthias; #686057]
 * Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
-* Show feedback notifications when user is busy [Stéphane; #662900]
-* Disable login button when there is no input [Stéphane; #687112]
-* Use non-linear overview shade for background [Giovanni, Pierre-Eric; #669798]
-* Reduce blocking in compositor thread [Simon, Jasper; #687465]
-* network: new country-specific type to gather providers [Aleksander; #687356]
 * Update man page [Matthias; #680601]
-* st-entry: Change the pointer cursor on enter/leave events [Thomas; #687130]
-* screenShield: Blur and desaturate the background [Giovanni, Cosimo; #682536]
-* Change height of chat notifications to have more context [Carlos; #665255]
-* screenShield: Account for motion velocity when hiding [Giovanni; #682537]
-* screenShield: hide the cursor while the lock screen is on [Giovanni; #682535]
-* Support remote search provider settings [Cosimo; #687491]
-* unlockDialog: Improve label of confirmation button [Stéphane; #687656]
-* userMenu: Rename "System Settings" item to "Settings" [Elad; #687738]
-* messageTray: Add keybinding to focus current notification [Stéphane; #652082]
-* Remove shell-screen-grabber [Neil; #685915]
-* main: Stop using Metacity's keybinding files [Florian; #687672]
-* Bluetooth: Remove ObexFTP functionality [Bastien; #688160]
-* a11y: Also set WM theme when HighContrast is switched on [Cosimo; #688256]
-* network: Rework multiple NIC support [Giovanni; #677142]
-* Rework keybindings to allow selective blocking/processing [Florian; #688202]
-* recorder: Show indicator on primary monitor [Adel; #688470]
-* recorder: Set frame duration to fix broken video headers [Adel; #688487]
-* Misc. bugfixes and cleanups [Florian, Jasper, Giovanni, Matthew, Stéphane,
-  Allan, Daiki, Owen, Alejandro, Jean-François, Cosimo, Sebastian, Adel, Alban;
-  #686484, #686728, #686805, #686574, #686763, #682428, #687132, #685239,
-  #687189, #687226, #658091, #670687, #687457, #687242, #687287, #687020,
-  #686583, #661194, #687491, #657315, #687958, #683986, #688089, #687708,
-  #686530, #684810, #688181, #688475, #688557, #688507, #638351]
+* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* Fix screenshots on Big Endian [Owen; #685915]
+* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Misc bugfixes [Jasper, Florian, Giovanni, Matthew, Matthias, Alejandro,
+  Sebastian; #686233, #686484, #686487, #686630, #686728, #686574, #686574,
+  #686574, #686879, #686763, #685239, #687189, #686736, #686583, #687132,
+  #687958, #687020, #687708, #686888, #686530, #684810, #688181]
 
 Contributors:
-  Elad Alfassa, Matthew Barnes, Alban Browaeys, Giovanni Campagna,
-  Cosimo Cecchi, Matthias Clasen, Allan Day, Stéphane Démurget,
-  Jean-François Fortin Tam, Adel Gadllah, Alex Hultman, Sebastian Keller,
-  Rui Matos, Simon McVittie, Aleksander Morgado, Florian Müllner,
-  Bastien Nocera, Pierre-Eric Pelloux-Prayer, Alejandro Piñeiro, Neil Roberts,
-  Sjoerd Simons, Carlos Soriano Sánchez, Jasper St. Pierre, Ray Strode,
-  Owen Taylor, Daiki Ueno, Thomas Wood
+  Matthew Barnes, Giovanni Campagna, Xavier Claessens, Matthias Clasen,
+  Sebastian Keller, Tim Lunn, Rui Matos, Florian Müllner, Alejandro Piñeiro,
+  Sjoerd Simons, Jasper St. Pierre, Ray Strode, Owen Taylor
 
 Translations:
-  Dušan Kazik [sk], Pavol Klačanský [sk], Piotr Drąg [pl], Yuri Myasoedov [ru],
-  Marek Černocký [cs], Kjartan Maraas [nb], Wolfgang Stöggl [de],
-  Yaron Shahrabani [he], Fran Diéguez [gl], Mattias Põldaru [et]
-
-3.7.1
-=====
-* Add shortcut to open application view directly [Jeremy; #685738]
-* Expose '<Super>F10' shortcut in System Settings [Florian; #672909]
-* Clean up timestamp format in chat notifications [Carlos; #680989]
-* loginScreen: Add support for 'disable-restart-buttons' [Florian; #686247]
-* Update textures automatically on file changes [Florian; #679268]
-* Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
-* Add missing translations for GSetting schema [Giovanni; #686413]
-* Hide workspace switcher completely when it's not necessary [Seif; #686483]
-* Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
-* Port to GnomeIdleMonitor [Jasper; #682224]
-* Set Empathy as preferred handler when delegating channels [Xavier; #686296]
-* Allow testing GDM login dialog from the session [Giovanni; #683725]
-* Use all available space for windows in window picker [Jasper, Pierre-Eric;
-  #582650]
-* Use logind for suspend if available [Florian; #686482]
-* Misc. fixes and cleanups [Jasper, Florian, Adel, Rui; #677426, #680426,
-  #686233, #686241, #686318, #686240, #686484, #686002, #684650, #686487]
-
-Contributors:
-  Jeremy Bicha, Giovanni Campagna, Xavier Claessens, Adel Gadllah, Seif Lotfy,
-  Tim Lunn, Rui Matos, Florian Müllner, Pierre-Eric Pelloux-Prayer,
-  Carlos Soriano, Jasper St. Pierre
-
-Translations:
-  Andika Triwidada [id], Matej Urbančič [sl], Ihar Hrachyshka [be],
-  Daniel Mustieles [es], Fran Diéguez [gl], Takayuki KUSANO [ja],
-  Мирослав Николић [sr, sr@latin], Dušan Kazik [sk], Tom Tryfonidis [el]
+  Takayuki KUSANO [ja], Dušan Kazik [sk], Mattias Põldaru [et],
+  Tom Tryfonidis [el], Sweta Kothari [gu], Matej Urbančič [sl], Piotr Drąg [pl],
+  Fran Diéguez [gl], Aurimas Černius [lt], Kjartan Maraas [nb],
+  Ihar Hrachyshka [be], Мирослав Николић [sr, sr@latin], Gil Forcada [ca],
+  A S Alam [pa], Yuri Myasoedov [ru], Marek Černocký [cs], Sweta Kothari [gu],
+  Wolfgang Stöggl [de], Daniel Mustieles [es]
 
 3.6.1
 =====

autogen.sh

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

browser-plugin/browser-plugin.c

@@ -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));

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.7.4.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -54,7 +54,7 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
 if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
-   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
+   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
    PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
 else
    AC_MSG_RESULT(no)
@@ -64,21 +64,20 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
 CLUTTER_MIN_VERSION=1.11.11
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.7.4
+GJS_MIN_VERSION=1.33.2
+MUTTER_MIN_VERSION=3.6.2
 GTK_MIN_VERSION=3.3.9
-GIO_MIN_VERSION=2.35.0
+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.7.1
+GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
-NETWORKMANAGER_MIN_VERSION=0.9.6
-PULSE_MIN_VERS=2.0
 
 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
@@ -99,9 +98,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 >= $NETWORKMANAGER_MIN_VERSION
-                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                               gnome-keyring-1 gcr-3 >= $GCR_MIN_VERSION)
+                               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)
 
@@ -123,10 +122,10 @@ CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
+PKG_CHECK_MODULES(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 >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
+PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)
 
 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -269,7 +268,6 @@ AC_CONFIG_FILES([
   js/Makefile
   src/calendar-server/evolution-calendar.desktop.in
   src/Makefile
-  src/gvc/Makefile
   browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in

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

@@ -8,14 +8,5 @@
 	<KeyListEntry name="toggle-message-tray"
                       _description="Show the message tray"/>
 
-	<KeyListEntry name="focus-active-notification"
-                      _description="Focus the active notification"/>
-
-	<KeyListEntry name="toggle-application-view"
-                      _description="Show all applications"/>
-
-	<KeyListEntry name="open-application-menu"
-                      _description="Open the application menu"/>
-
 </KeyListEntries>
 

data/Makefile.am

@@ -11,10 +11,7 @@ desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 introspectiondir = $(datadir)/dbus-1/interfaces
-introspection_DATA =				\
-	org.gnome.Shell.Screenshot.xml		\
-	org.gnome.ShellSearchProvider.xml	\
-	org.gnome.ShellSearchProvider2.xml
+introspection_DATA = org.gnome.ShellSearchProvider.xml
 
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
@@ -35,7 +32,6 @@ dist_theme_DATA =				\
 	theme/gnome-shell.css			\
 	theme/logged-in-indicator.svg		\
 	theme/message-tray-background.png	\
-	theme/more-results.svg			\
 	theme/noise-texture.png			\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\

data/org.gnome.Shell.Screenshot.xml

@@ -1,128 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Screenshot:
-      @short_description: Screenshot interface
-
-      The interface used to capture pictures of the screen contents.
-  -->
-  <interface name="org.gnome.Shell.Screenshot">
-
-    <!--
-        Screenshot:
-        @filename: The filename for the screenshot
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the screen or not
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the whole screen and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="Screenshot">
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotWindow:
-        @include_frame: Whether to include the frame or not
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the window area or not
-        @filename: The filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the focused window (optionally omitting the frame)
-        and saves it in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotWindow">
-      <arg type="b" direction="in" name="include_frame"/>
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotArea:
-        @x: the X coordinate of the area to capture
-        @y: the Y coordinate of the area to capture
-        @width: the width of the area to capture
-        @height: the height of the area to capture
-        @flash: whether to flash the area or not
-        @filename: the filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the passed in area and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        FlashArea:
-        @x: the X coordinate of the area to flash
-        @y: the Y coordinate of the area to flash
-        @width: the width of the area to flash
-        @height: the height of the area to flash
-
-        Renders a flash spot effect in the specified rectangle of the screen.
-    -->
-    <method name="FlashArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-    </method>
-
-    <!--
-        SelectArea:
-        @x: the X coordinate of the selected area
-        @y: the Y coordinate of the selected area
-        @width: the width of the selected area
-        @height: the height of the selected area
-
-        Interactively allows the user to select a rectangular area of
-        the screen, and returns its coordinates.
-    -->
-    <method name="SelectArea">
-      <arg type="i" direction="out" name="x"/>
-      <arg type="i" direction="out" name="y"/>
-      <arg type="i" direction="out" name="width"/>
-      <arg type="i" direction="out" name="height"/>
-    </method>
-
-  </interface>
-</node>

data/org.gnome.ShellSearchProvider.xml

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

data/org.gnome.ShellSearchProvider2.xml

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

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

@@ -65,16 +65,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         menuitem in single-user, single-session situations.
       </_description>
     </key>
-    <key name="remember-mount-password" type="b">
-      <default>false</default>
-      <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>
-      <_description>
-        The shell will request a password when an encrypted device or a
-        remote filesystem is mounted.  If the password can be saved for
-        future use a 'Remember Password' checkbox will be present.
-        This key sets the default state of the checkbox.
-      </_description>
-    </key>
     <child name="calendar" schema="org.gnome.shell.calendar"/>
     <child name="recorder" schema="org.gnome.shell.recorder"/>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
@@ -101,14 +91,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         Keybinding to open the application menu.
       </_description>
     </key>
-    <key name="toggle-application-view" type="as">
-      <default>["&lt;Super&gt;a"]</default>
-      <_summary>Keybinding to open the "Show Applications" view</_summary>
-      <_description>
-        Keybinding to open the "Show Applications" view of the Activities
-        Overview.
-      </_description>
-    </key>
     <key name="toggle-message-tray" type="as">
       <default>["&lt;Super&gt;m"]</default>
       <_summary>Keybinding to toggle the visibility of the message tray</_summary>
@@ -116,13 +98,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         Keybinding to toggle the visibility of the message tray.
       </_description>
     </key>
-    <key name="focus-active-notification" type="as">
-      <default>["&lt;Super&gt;n"]</default>
-      <_summary>Keybinding to focus the active notification</_summary>
-      <_description>
-        Keybinding to focus the active notification.
-      </_description>
-    </key>
     <key name="toggle-recording" type="as">
       <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
       <_summary>Keybinding to toggle the screen recorder</_summary>
@@ -181,75 +156,47 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
     </key>
   </schema>
 
-  <enum id="org.gnome.shell.window-switcher.AppIconMode">
-    <value value="1" nick="thumbnail-only"/>
-    <value value="2" nick="app-icon-only"/>
-    <value value="3" nick="both"/>
-  </enum>
-  <schema id="org.gnome.shell.window-switcher"
-          path="/org/gnome/shell/window-switcher/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="app-icon-mode" enum="org.gnome.shell.window-switcher.AppIconMode">
-      <default>'both'</default>
-      <_summary>The application icon mode.</_summary>
-      <_description>
-	Configures how the windows are shown in the switcher. Valid possibilities
-	are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only'
-	(shows only the application icon) or 'both'.
-      </_description>
-    </key>
-    <key type="b" name="current-workspace-only">
-      <default>false</default>
-      <summary>Limit switcher to current workspace.</summary>
-      <description>
-	If true, only windows from the current workspace are shown in the switcher.
-	Otherwise, all windows are included.
-      </description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
-	  gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/">
     <key name="attach-modal-dialogs" type="b">
       <default>true</default>
-      <_summary>Attach modal dialog to the parent window</_summary>
-      <_description>
+      <summary>Attach modal dialog to the parent window</summary>
+      <description>
         This key overrides the key in org.gnome.mutter when running
         GNOME Shell.
-      </_description>
+      </description>
     </key>
 
     <key name="button-layout" type="s">
       <default>":close"</default>
-      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <_description>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
         This key overrides the key in org.gnome.desktop.wm.preferences when
         running GNOME Shell.
-      </_description>
+      </description>
     </key>
 
     <key name="edge-tiling" type="b">
       <default>true</default>
-      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <_description>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
     </key>
 
     <key name="dynamic-workspaces" type="b">
       <default>true</default>
-      <_summary>Workspaces are managed dynamically</_summary>
-      <_description>
+      <summary>Workspaces are managed dynamically</summary>
+      <description>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
     </key>
 
     <key name="workspaces-only-on-primary" type="b">
       <default>true</default>
-      <_summary>Workspaces only on primary monitor</_summary>
-      <_description>
+      <summary>Workspaces only on primary monitor</summary>
+      <description>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
     </key>
 
     <key name="focus-change-on-pointer-rest" type="b">

data/theme/gnome-shell.css

@@ -39,6 +39,7 @@ stage {
 /* small */
 .app-well-menu,
 .contact-details-status,
+.run-dialog-label,
 .run-dialog-error-label {
     font-size: 9pt;
 }
@@ -49,7 +50,7 @@ stage {
 .switcher-list, 
 .app-well-app > .overview-icon,
 .show-apps > .overview-icon,
-.grid-search-result .overview-icon {
+.search-result-content > .overview-icon {
     font-size: 9pt;
     font-weight: bold;
 }
@@ -206,12 +207,11 @@ StScrollBar StButton#vhandle:active {
 }
 
 .popup-separator-menu-item {
-    -gradient-height: 1px;
-    -gradient-start: rgba(255,255,255,0.0);
-    -gradient-end: rgba(255,255,255,0.3);
-    -margin-horizontal: 24px;
-    height: 1px;
-    padding: 8px 0px;
+    -gradient-height: 2px;
+    -gradient-start: rgba(8,8,8,0);
+    -gradient-end: #333333;
+    -margin-horizontal: 1.5em;
+    height: 1em;
 }
 
 .popup-alternating-menu-item:alternate {
@@ -252,10 +252,6 @@ StScrollBar StButton#vhandle:active {
     icon-size: 1.09em;
 }
 
-.popup-battery-percentage {
-    padding-left: 24px;
-}
-
 /* Switches */
 .toggle-switch {
     width: 65px;
@@ -292,17 +288,13 @@ StScrollBar StButton#vhandle:active {
 .hotplug-notification-item,
 .hotplug-resident-eject-button,
 .modal-dialog-button {
+    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,
-.modal-dialog-button {
-    font-weight: bold;
-}
-
 .dash-search-button:hover,
 .notification-button:hover,
 .notification-icon-button:hover,
@@ -319,7 +311,7 @@ StScrollBar StButton#vhandle:active {
 .notification-icon-button:focus,
 .hotplug-notification-item:focus,
 .modal-dialog-button:focus {
-    border-width: 2px;
+    border: 2px solid #8b8b8b;
 }
 
 .dash-search-button:active,
@@ -334,20 +326,17 @@ StScrollBar StButton#vhandle:active {
     background-gradient-end: rgba(255, 255, 255, 0.2);
 }
 
-.notification-button:insensitive,
 .notification-icon-button:insensitive,
-.modal-dialog-button:insensitive {
-    border-color: #666666;
+.notification-button:insensitive {
     color: #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
 }
 
 /* Entries */
 
 #searchEntry,
 .notification StEntry,
-.modal-dialog StEntry {
+.login-dialog-prompt-entry,
+.prompt-dialog-password-entry {
     color: rgb(64, 64, 64);
     caret-color: rgb(64, 64, 64);
     font-size: 12pt;
@@ -357,20 +346,20 @@ StScrollBar StButton#vhandle:active {
 }
 
 #searchEntry,
-.run-dialog-entry,
 .notification StEntry {
     border: 2px solid rgba(245,245,245,0.2);
     background-gradient-start: rgba(5,5,6,0.1);
     background-gradient-end: rgba(254,254,254,0.1);
     background-gradient-direction: vertical;
-    transition-duration: 300ms;
+    transition-duration: 300;
     box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
 }
 
 #searchEntry:focus,
 #searchEntry:hover,
 .notification StEntry:focus,
-.modal-dialog StEntry {
+.login-dialog-prompt-entry,
+.prompt-dialog-password-entry {
     border: 2px solid rgb(136,138,133);
     background-gradient-start: rgb(200,200,200);
     background-gradient-end: white;
@@ -379,17 +368,12 @@ StScrollBar StButton#vhandle:active {
 }
 
 .notification StEntry:focus,
-.modal-dialog StEntry:focus {
+.prompt-dialog-password-entry:focus,
+.login-dialog-prompt-entry:focus {
     border: 2px solid #3465a4;
 }
 
 #searchEntry {
-    border-color: rgba(245,245,245,0.3);
-    color: rgb(192, 192, 192);
-    caret-color: rgb(192, 192, 192);
-}
-
-#searchEntry:hover {
     color: rgb(128, 128, 128);
     caret-color: rgb(128, 128, 128);
 }
@@ -398,11 +382,12 @@ StScrollBar StButton#vhandle:active {
     color: rgb(64, 64, 64);
     caret-color: rgb(64, 64, 64);
     font-weight: bold;
-    transition-duration: 0ms;
+    transition-duration: 0;
 }
 
 .notification StEntry,
-.modal-dialog StEntry {
+.prompt-dialog-password-entry,
+.login-dialog-prompt-entry {
     border-radius: 5px;
     padding: 4px 4px;
 }
@@ -414,13 +399,11 @@ StScrollBar StButton#vhandle:active {
     padding: 0 4px;
 }
 
-.modal-dialog StEntry:insensitive {
-    border-color: #666666;
-    color: #9f9f9f;
-    border: 2px solid #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
-    box-shadow: inset 0 0 rgba(0,0,0,1.0);
+.login-dialog-prompt-entry:insensitive {
+    color: rgba(0,0,0,0.7);
+    border: 2px solid #565656;
+    background-gradient-start: rgb(200,200,200);
+    background-gradient-end: rgb(210,210,210);
 }
 
 /* Panel */
@@ -429,18 +412,6 @@ StScrollBar StButton#vhandle:active {
     background-color: black;
     font-weight: bold;
     height: 1.86em;
-    transition-duration: 250ms;
-}
-
-#panel.lock-screen {
-    height: 2em;
-    background-color: rgba(0,0,0,0.3);
-}
-
-#panel.unlock-screen,
-#panel.login-screen {
-    height: 2em;
-    background-color: transparent;
 }
 
 #panelLeft, #panelCenter {
@@ -476,13 +447,6 @@ StScrollBar StButton#vhandle:active {
     -panel-corner-border-color: rgba(255,255,255,0.8);
 }
 
-.panel-corner.lock-screen,
-.panel-corner.unlock-screen,
-.panel-corner.login-screen {
-    -panel-corner-background-color: transparent;
-    -panel-corner-border-color: transparent;
-}
-
 #appMenu {
     spacing: 4px;
 }
@@ -512,25 +476,7 @@ StScrollBar StButton#vhandle:active {
     -minimum-hpadding: 6px;
     font-weight: bold;
     color: #ccc;
-    transition-duration: 100ms;
-}
-
-#panel.unlock-screen .panel-button,
-#panel.lock-screen .panel-button,
-#panel.login-screen .panel-button {
-    color: #e6e6e6;
-}
-
-#panel.unlock-screen .panel-button:hover,
-#panel.lock-screen .panel-button:hover,
-#panel.login-screen .panel-button:hover,
-#panel.unlock-screen .panel-button:active,
-#panel.lock-screen .panel-button:active,
-#panel.login-screen .panel-button:active,
-#panel.unlock-screen .panel-button:focus,
-#panel.lock-screen .panel-button:focus,
-#panel.login-screen .panel-button:focus {
-    color: white;
+    transition-duration: 100;
 }
 
 .panel-button:hover {
@@ -567,10 +513,6 @@ StScrollBar StButton#vhandle:active {
     spacing: 4px;
 }
 
-.lock-screen-status-button-box {
-    spacing: 8px;
-}
-
 /* User Menu */
 
 #panelUserMenu {
@@ -609,6 +551,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .status-chooser-combo.popup-combo-menu {
+    background-color: rgba(0,0,0,0.7);
     padding: .4em 0em;
     border-radius: 4px;
     border: 1px solid #5f5f5f;
@@ -626,15 +569,7 @@ StScrollBar StButton#vhandle:active {
 /* Overview */
 
 #overview {
-    spacing: 24px;
-}
-
-#overview-group {
-    spacing: 32px;
-}
-
-.workspaces-display {
-    spacing: 32px; /* needs to be the same value as #overview-group */
+    spacing: 12px;
 }
 
 .window-caption {
@@ -675,7 +610,6 @@ StScrollBar StButton#vhandle:active {
     border-radius: 8px;
     padding: 4px 12px;
     -shell-caption-spacing: 12px;
-    border: 2px solid rgba(0, 0, 0, 0);
 }
 
 .window-close, .notification-close {
@@ -686,16 +620,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .window-close {
-    -shell-close-overlap: 16px;
-}
-
-.window-caption:hover {
-    border: 2px solid rgba(255, 255, 255, 0);
-}
-
-.window-clone-border {
-    border: 4px solid rgba(255, 255, 255, 0.5);
-    border-radius: 4px;
+    -shell-close-overlap: 20px;
 }
 
 .notification-close {
@@ -708,25 +633,13 @@ StScrollBar StButton#vhandle:active {
      * adjust down 8px */
 
     -shell-close-overlap-x: 14px;
-    -shell-close-overlap-y: -12px;
-}
-
-.notification-close:rtl {
-    /* as above, but starting out in the top left of the
-     * notification. */
-
-    -shell-close-overlap-x: -14px;
+    -shell-close-overlap-y: 12px;
 }
 
 .window-close:rtl {
     -st-background-image-shadow: 2px 2px 6px rgba(0,0,0,0.5);
 }
 
-.window-picker {
-    -horizontal-spacing: 32px;
-    -vertical-spacing: 32px;
-}
-
 /* Dash */
 
 #dash {
@@ -764,11 +677,6 @@ StScrollBar StButton#vhandle:active {
 
 .search-entry-icon {
     icon-size: 1em;
-    color: #c0c0c0;
-}
-
-#searchEntry:hover .search-entry-icon,
-#searchEntry:focus .search-entry-icon {
     color: #8d8f8a;
 }
 
@@ -781,7 +689,7 @@ StScrollBar StButton#vhandle:active {
 
 #searchResultsContent {
     padding-right: 20px;
-    spacing: 16px;
+    spacing: 36px;
 }
 
 #searchResultsContent:rtl {
@@ -789,22 +697,11 @@ StScrollBar StButton#vhandle:active {
     padding-left: 20px;
 }
 
-.search-section {
-    /* This should be equal to #searchResultsContent spacing */
-    spacing: 16px;
-}
-
-.search-section-separator {
-    -gradient-height: 1px;
-    -gradient-start: rgba(255,255,255,0);
-    -gradient-end: rgba(255,255,255,0.5);
-    -margin-horizontal: 1.5em;
-    height: 1px;
-}
-
-.search-section-content {
-    /* This is the space between the provider icon and the results container */
-    spacing: 32px;
+.search-section-header {
+    padding: 4px 12px;
+    spacing: 4px;
+    color: #6f6f6f;
+    font-size: .8em;
 }
 
 .search-statustext {
@@ -813,8 +710,16 @@ StScrollBar StButton#vhandle:active {
     font-weight: bold;
 }
 
-.list-search-results {
-    spacing: 3px;
+.search-section-results {
+    padding: 6px;
+}
+
+.search-section-list-results {
+    spacing: 4px;
+}
+
+.results-container {
+    spacing: 4px;
 }
 
 /* Text labels are an odd number of pixels tall. The uneven top and bottom
@@ -843,7 +748,7 @@ StScrollBar StButton#vhandle:active {
     -x-offset: 8px;
 }
 
-/* Application Launchers, Grid and List results */
+/* Application Launchers and Grid */
 
 .icon-grid {
     spacing: 36px;
@@ -895,38 +800,13 @@ StScrollBar StButton#vhandle:active {
     padding: 4px 8px;
 }
 
-.list-search-result-content {
-    spacing: 12px;
-    padding: 12px;
-}
-
-.list-search-result-title {
-    font-weight: bold;
-    font-size: 14pt;
-    color: white;
-}
-
-.list-search-result-description {
-    font-weight: bold;
-    font-size: 12pt;
-    color: #eeeeec;
-}
-
-.search-provider-icon-more {
-    width: 16px;
-    height: 16px;
-    background-image: url("more-results.svg");
-}
-
 .app-well-app > .overview-icon,
 .show-apps > .overview-icon,
-.search-provider-icon,
-.list-search-result,
-.grid-search-result .overview-icon {
+.search-result-content > .overview-icon {
     border-radius: 4px;
     padding: 3px;
     border: 1px rgba(0,0,0,0);
-    transition-duration: 100ms;
+    transition-duration: 100;
     text-align: center;
 }
 
@@ -938,12 +818,10 @@ StScrollBar StButton#vhandle:active {
 
 .app-well-app:hover > .overview-icon,
 .show-apps:hover > .overview-icon,
-.search-provider-icon:hover,
-.list-search-result:hover,
-.grid-search-result: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: 100ms;
+    transition-duration: 100;
     color:white;
 }
 
@@ -965,24 +843,20 @@ StScrollBar StButton#vhandle:active {
     background-gradient-direction: vertical;
     border-radius: 4px;
     box-shadow: inset 0px 1px 2px 0px rgba(0, 0, 0, 1);
-    transition-duration: 100ms;
+    transition-duration: 100;
 }
 
 .show-apps:checked .show-apps-icon,
 .show-apps:focus .show-apps-icon {
     color: white;
-    transition-duration: 100ms;
+    transition-duration: 100;
 }
 
 .app-well-app:focus > .overview-icon,
-.grid-search-result:focus .overview-icon,
+.search-result-content:focus > .overview-icon,
 .show-apps:focus > .overview-icon,
-.search-provider-icon:focus,
-.list-search-result:focus,
 .app-well-app:selected > .overview-icon,
-.grid-search-result:selected .overview-icon,
-.search-provider-icon:selected,
-.list-search-result:selected {
+.search-result-content:selected > .overview-icon {
     background-color: rgba(255,255,255,0.33);
 }
 
@@ -1010,7 +884,7 @@ StScrollBar StButton#vhandle:active {
     -minimum-hpadding: 6px;
     font-weight: bold;
     color: #ccc;
-    transition-duration: 100ms;
+    transition-duration: 100;
     padding-left: .3em;
     padding-right: .3em;
 }
@@ -1313,8 +1187,7 @@ StScrollBar StButton#vhandle:active {
 #message-tray {
     background: #2e3436 url(message-tray-background.png);
     background-repeat: repeat;
-    transition-duration: 250ms;
-    height: 72px;
+    transition-duration: 250;
 }
 
 #message-tray:keyboard {
@@ -1327,21 +1200,11 @@ StScrollBar StButton#vhandle:active {
     outline: 1px solid rgba(128, 128, 128, 0.3);
 }
 
-.message-tray-summary {
-    height: 72px;
-}
-
-.no-messages-label {
-    font-family: cantarell, sans-serif;
-    font-size: 11pt;
-    color: #999999;
-}
-
 .notification {
     border-radius: 10px 10px 0px 0px;
-    background: rgba(0,0,0,0.9);
+    background: rgba(0,0,0,0.8);
     padding: 8px 8px 4px 8px;
-    spacing-rows: 4px;
+    spacing-rows: 10px;
     spacing-columns: 10px;
 }
 
@@ -1370,8 +1233,8 @@ StScrollBar StButton#vhandle:active {
 }
 
 .summary-boxpointer {
-    -arrow-border-radius: 15px;
-    -arrow-background-color: rgba(0,0,0,0.9);
+    -arrow-border-radius: 8px;
+    -arrow-background-color: rgba(0,0,0,0.8);
     -arrow-base: 36px;
     -arrow-rise: 18px;
     color: white;
@@ -1391,8 +1254,8 @@ StScrollBar StButton#vhandle:active {
 
 .summary-notification-stack-scrollview {
     max-height: 18em;
-    padding-top: 8px;
-    padding-bottom: 8px;
+    padding-top: 6px;
+    padding-bottom: 6px;
 }
 
 .summary-notification-stack-scrollview:ltr {
@@ -1421,7 +1284,6 @@ StScrollBar StButton#vhandle:active {
 }
 
 .notification-actions {
-    padding-top: 18px;
     spacing: 10px;
 }
 
@@ -1548,10 +1410,6 @@ StScrollBar StButton#vhandle:active {
     padding-right: 4px;
 }
 
-.chat-notification-scrollview{
-	max-height: 22em;
-}
-
 .subscription-message {
     font-style: italic;
 }
@@ -1560,6 +1418,10 @@ StScrollBar StButton#vhandle:active {
     border-radius: 4px;
 }
 
+#summary-mode {
+    height: 72px;
+}
+
 .summary-source-button {
     padding: 6px 3px 6px 3px;
 }
@@ -1584,22 +1446,22 @@ StScrollBar StButton#vhandle:active {
 .summary-source {
     border-radius: 4px;
     padding: 0 6px 0 6px;
-    transition-duration: 100ms;
+    transition-duration: 100;
 }
 
 .summary-source-counter {
     background-image: url("summary-counter.svg");
-    background-size: 2.4em;
+    background-size: 2.5em;
     font-size: 10pt;
     font-weight: bold;
-    height: 2.4em;
-    width: 2.4em;
-    -shell-counter-overlap-x: 13px;
-    -shell-counter-overlap-y: 13px;
+    height: 2.5em;
+    width: 2.5em;
+    -shell-counter-overlap-x: 4px;
+    -shell-counter-overlap-y: 4px;
 }
 
 /* App Switcher */
-.switcher-popup {
+#altTabPopup {
     padding: 8px;
     spacing: 16px;
 }
@@ -1762,26 +1624,35 @@ StScrollBar StButton#vhandle:active {
     padding: 4px 32px 5px;
 }
 
+.modal-dialog-button:insensitive {
+    color: rgb(60, 60, 60);
+}
+
 .modal-dialog-button:focus {
     padding: 3px 31px 4px;
 }
 
 /* Run Dialog */
 
-.run-dialog-label {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #999999;
-    padding-bottom: .4em;
-}
-
 .run-dialog-error-box {
     padding-top: 15px;
     spacing: 5px;
 }
 
-.modal-dialog .run-dialog-entry {
-    width: 20em;
+.run-dialog-entry {
+    font-weight: bold;
+    width: 23em;
+    selection-background-color: white;
+    selected-color: black;
+}
+
+.run-dialog {
+    border-radius: 16px;
+
+    padding-right: 21px;
+    padding-left: 21px;
+    padding-bottom: 15px;
+    padding-top: 15px;
 }
 
 .lightbox {
@@ -2241,7 +2112,7 @@ StScrollBar StButton#vhandle:active {
     font-weight: bold;
     text-align: left;
     padding-left: 15px;
-    text-shadow: black 0px 4px 3px 0px;
+    text-shadow: black 4px 4px 3px 0px;
 }
 
 .login-dialog-prompt-layout {
@@ -2307,24 +2178,24 @@ StScrollBar StButton#vhandle:active {
     height: .75em;
 }
 
-.login-dialog .modal-dialog-button-box {
-    spacing: 3px;
-}
 
 .login-dialog .modal-dialog-button {
+    border: 1px solid #666666;
     border-radius: 5px;
     padding: 3px 18px;
 }
 
 .login-dialog .modal-dialog-button:focus {
     padding: 2px 17px;
+    border: 2px solid #8b8b8b;
 }
 
 .login-dialog .modal-dialog-button:default {
     background-gradient-start: #6793c4;
     background-gradient-end: #335d8f;
     background-gradient-direction: vertical;
-    border-color: #16335d;
+    padding: 2px 17px;
+    border: 2px solid #16335d;
 }
 
 .login-dialog .modal-dialog-button:default:focus {
@@ -2342,13 +2213,6 @@ StScrollBar StButton#vhandle:active {
     background-gradient-end: #74a0d0;
 }
 
-.login-dialog .modal-dialog-button:default:insensitive {
-    border-color: #666666;
-    color: #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
-}
-
 .login-dialog-message-warning {
     color: orange;
 }
@@ -2416,21 +2280,16 @@ StScrollBar StButton#vhandle:active {
 }
 
 .screen-shield-notification-source {
-    padding: 13px 24px;
+    padding: 0 24px;
     spacing: 5px;
 }
 
 .screen-shield-notification-label {
     font-size: 1.2em;
     font-weight: bold;
-    padding: 0px 18px;
     color: #babdb6;
 }
 
-.screen-shield-notification-count-text {
-    padding: 0px 18px;
-}
-
 /* Remove background from notifications, otherwise
    opacity is doubled and they look darker
 */
@@ -2446,8 +2305,3 @@ StScrollBar StButton#vhandle:active {
     padding-bottom: 0px;
 }
 
-.input-source-switcher-symbol {
-   font-size: 42pt;
-   width: 96px;
-   height: 96px;
-}

data/theme/more-results.svg

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

docs/reference/shell/Makefile.am

@@ -76,30 +76,9 @@ endif
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
 
-doc-gen-org.gnome.Shell.SearchProvider.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-
-doc-gen-org.gnome.Shell.SearchProvider2.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider2. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-
-doc-gen-org.gnome.Shell.Screenshot.xml: $(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.Shell.Screenshot.		\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= \
-	doc-gen-org.gnome.Shell.SearchProvider.xml	\
-	doc-gen-org.gnome.Shell.SearchProvider2.xml	\
-	doc-gen-org.gnome.Shell.Screenshot.xml
+content_files=
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

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

@@ -43,8 +43,6 @@
   </chapter>
   <chapter>
     <title>Integration helpers and utilities</title>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
     <xi:include href="xml/shell-global.xml"/>
     <xi:include href="xml/shell-wm.xml"/>
     <xi:include href="xml/shell-xfixes-cursor.xml"/>

gnome-shell.doap

@@ -52,6 +52,13 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>walters</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Dan Winship</foaf:name>
+      <foaf:mbox rdf:resource="mailto:danw@gnome.org" />
+      <gnome:userid>danw</gnome:userid>
+    </foaf:Person>
+  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Marina Zhurakhinskaya</foaf:name>

js/Makefile.am

@@ -49,6 +49,7 @@ nobase_dist_js_DATA = 	\
 	ui/extensionSystem.js	\
 	ui/extensionDownloader.js \
 	ui/environment.js	\
+	ui/flashspot.js		\
 	ui/ibusCandidatePopup.js\
 	ui/grabHelper.js	\
 	ui/iconGrid.js		\
@@ -61,7 +62,6 @@ nobase_dist_js_DATA = 	\
 	ui/main.js		\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
-	ui/separator.js		\
 	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
@@ -73,7 +73,6 @@ nobase_dist_js_DATA = 	\
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
 	ui/runDialog.js		\
-	ui/screenshot.js	\
         ui/screenShield.js	\
 	ui/scripting.js		\
 	ui/search.js		\
@@ -86,7 +85,6 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
-	ui/switcherPopup.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
 	ui/userMenu.js		\

js/gdm/loginDialog.js

@@ -39,19 +39,13 @@ const GdmUtil = imports.gdm.util;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
-const Panel = imports.ui.panel;
-const PanelMenu = imports.ui.panelMenu;
 const Tweener = imports.ui.tweener;
 const UserMenu = imports.ui.userMenu;
 
 const _RESIZE_ANIMATION_TIME = 0.25;
 const _SCROLL_ANIMATION_TIME = 0.5;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
-const _LOGO_ICON_HEIGHT = 16;
-
-const WORK_SPINNER_ICON_SIZE = 24;
-const WORK_SPINNER_ANIMATION_DELAY = 1.0;
-const WORK_SPINNER_ANIMATION_TIME = 0.3;
+const _LOGO_ICON_NAME_SIZE = 48;
 
 let _loginDialog = null;
 
@@ -88,36 +82,6 @@ function _smoothlyResizeActor(actor, width, height) {
     return hold;
 }
 
-const LogoMenuButton = new Lang.Class({
-    Name: 'LogoMenuButton',
-    Extends: PanelMenu.Button,
-
-    _init: function() {
-        this.parent(0.0, null, true);
-
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
-                               Lang.bind(this, this._updateLogo));
-
-        this._iconBin = new St.Bin();
-        this.actor.add_actor(this._iconBin);
-
-        this._updateLogo();
-    },
-
-    _updateLogo: function() {
-        let path = this._settings.get_string(GdmUtil.LOGO_KEY);
-        let icon = null;
-
-        if (path) {
-            let file = Gio.file_new_for_path(path);
-            let cache = St.TextureCache.get_default();
-            icon = cache.load_uri_async(file.get_uri(), -1, _LOGO_ICON_HEIGHT);
-        }
-        this._iconBin.set_child(icon);
-    }
-});
-
 const UserListItem = new Lang.Class({
     Name: 'UserListItem',
 
@@ -532,7 +496,6 @@ const SessionListItem = new Lang.Class({
                           color.alpha / 255);
         cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
         cr.fill();
-        cr.$dispose();
     },
 
     _onClicked: function() {
@@ -610,14 +573,6 @@ const SessionList = new Lang.Class({
             this.close();
     },
 
-    updateSensitivity: function(sensitive) {
-        this._button.reactive = sensitive;
-        this._button.can_focus = sensitive;
-
-        for (let id in this._items)
-            this._items[id].actor.reactive = sensitive;
-    },
-
     setActiveSession: function(sessionId) {
          if (sessionId == this._activeSessionId)
              return;
@@ -674,7 +629,6 @@ const LoginDialog = new Lang.Class({
         this.parent({ shellReactive: true,
                       styleClass: 'login-dialog',
                       parentActor: parentActor,
-                      keybindingMode: Main.KeybindingMode.LOGIN_SCREEN,
                       shouldFadeIn: false });
         this.connect('destroy',
                      Lang.bind(this, this._onDestroy));
@@ -684,22 +638,19 @@ const LoginDialog = new Lang.Class({
         this._userManager = AccountsService.UserManager.get_default()
         this._greeterClient = new Gdm.Client();
 
-        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            this._greeter = this._greeterClient.get_greeter_sync(null);
+        this._greeter = this._greeterClient.get_greeter_sync(null);
 
-            this._greeter.connect('default-session-name-changed',
-                                  Lang.bind(this, this._onDefaultSessionChanged));
+        this._greeter.connect('default-session-name-changed',
+                              Lang.bind(this, this._onDefaultSessionChanged));
 
-            this._greeter.connect('session-opened',
-                                  Lang.bind(this, this._onSessionOpened));
-            this._greeter.connect('timed-login-requested',
-                                  Lang.bind(this, this._onTimedLoginRequested));
-        }
+        this._greeter.connect('session-opened',
+                              Lang.bind(this, this._onSessionOpened));
+        this._greeter.connect('timed-login-requested',
+                              Lang.bind(this, this._onTimedLoginRequested));
 
         this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient);
         this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
         this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._verificationFailed));
         this._userVerifier.connect('reset', Lang.bind(this, this._reset));
         this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
         this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
@@ -707,6 +658,8 @@ const LoginDialog = new Lang.Class({
 
         this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
+        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
+                               Lang.bind(this, this._updateLogo));
         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                                Lang.bind(this, this._updateBanner));
         this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
@@ -714,6 +667,10 @@ const LoginDialog = new Lang.Class({
         this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
                                Lang.bind(this, this._updateDisableUserList));
 
+        this._logoBox = new St.Bin({ style_class: 'login-dialog-logo-box' });
+        this.contentLayout.add(this._logoBox);
+        this._updateLogo();
+
         this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
                                            text: '' });
         this.contentLayout.add(this._bannerLabel);
@@ -751,7 +708,6 @@ const LoginDialog = new Lang.Class({
                               x_align: St.Align.START });
         this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                            can_focus: true });
-        this._promptEntryTextChangedId = 0;
         this._promptBox.add(this._promptEntry,
                             { expand: true,
                               x_fill: true,
@@ -765,9 +721,6 @@ const LoginDialog = new Lang.Class({
         this._promptLoginHint.hide();
         this._promptBox.add(this._promptLoginHint);
 
-        this._signInButton = null;
-        this._workSpinner = null;
-
         this._sessionList = new SessionList();
         this._sessionList.connect('session-activated',
                                   Lang.bind(this, function(list, sessionId) {
@@ -830,8 +783,22 @@ const LoginDialog = new Lang.Class({
             this._disableUserList = disableUserList;
 
             if (!this._verifyingUser)
-                this._reset();
+               this._reset();
         }
+   },
+
+    _updateLogo: function() {
+        this._logoBox.child = null;
+        let path = this._settings.get_string(GdmUtil.LOGO_KEY);
+
+        if (path) {
+            let file = Gio.file_new_for_path(path);
+            let uri = file.get_uri();
+
+            let textureCache = St.TextureCache.get_default();
+            this._logoBox.child = textureCache.load_uri_async(uri, -1, _LOGO_ICON_NAME_SIZE);
+        }
+
     },
 
     _updateBanner: function() {
@@ -847,7 +814,6 @@ const LoginDialog = new Lang.Class({
     },
 
     _reset: function() {
-        this._updateSensitivity(true);
         this._promptMessage.hide();
         this._user = null;
         this._verifyingUser = false;
@@ -858,13 +824,6 @@ const LoginDialog = new Lang.Class({
             this._showUserList();
     },
 
-    _verificationFailed: function() {
-        this._promptEntry.text = '';
-
-        this._updateSensitivity(true);
-        this._setWorking(false);
-    },
-
     _onDefaultSessionChanged: function(client, sessionId) {
         this._sessionList.setActiveSession(sessionId);
     },
@@ -932,15 +891,28 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
-    _showPrompt: function(forSecret) {
+    _showPrompt: function() {
         let hold = new Batch.Hold();
 
+        let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
+                                 label: _("Cancel"),
+                                 key: Clutter.Escape };
+        let okButtonInfo = { action: Lang.bind(this, function() {
+                                         hold.release();
+                                     }),
+                             label: C_("button", "Sign In"),
+                             default: true };
+        let buttons = [];
+        if (!this._disableUserList || this._verifyingUser)
+            buttons.push(cancelButtonInfo);
+        buttons.push(okButtonInfo);
+
         let tasks = [function() {
                          return this._fadeInPrompt();
                      },
 
                      function() {
-                         this._prepareDialog(forSecret, hold);
+                         this.setButtons(buttons);
                      },
 
                      hold];
@@ -950,86 +922,17 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
-    _prepareDialog: function(forSecret, hold) {
-        this._workSpinner = new Panel.AnimatedIcon('process-working.svg', WORK_SPINNER_ICON_SIZE);
-        this._workSpinner.actor.opacity = 0;
-        this._workSpinner.actor.show();
-
-        this.buttonLayout.visible = true;
-        this.clearButtons();
-
-        if (!this._disableUserList || this._verifyingUser)
-            this.addButton({ action: Lang.bind(this, this.cancel),
-                             label: _("Cancel"),
-                             key: Clutter.Escape },
-                           { expand: true,
-                             x_fill: false,
-                             y_fill: false,
-                             x_align: St.Align.START,
-                             y_align: St.Align.MIDDLE });
-        this.buttonLayout.add(this._workSpinner.actor,
-                              { expand: false,
-                                x_fill: false,
-                                y_fill: false,
-                                x_align: St.Align.END,
-                                y_align: St.Align.MIDDLE });
-        this._signInButton = this.addButton({ action: Lang.bind(this, function() {
-                                                          hold.release();
-                                                      }),
-                                              label: forSecret ? C_("button", "Sign In") : _("Next"),
-                                              default: true },
-                                            { expand: false,
-                                              x_fill: false,
-                                              y_fill: false,
-                                              x_align: St.Align.END,
-                                              y_align: St.Align.MIDDLE });
-
-        this._updateSignInButtonSensitivity(this._promptEntry.text.length > 0);
-
-        this._promptEntryTextChangedId =
-            this._promptEntry.clutter_text.connect('text-changed',
-                                                    Lang.bind(this, function() {
-                                                        this._updateSignInButtonSensitivity(this._promptEntry.text.length > 0);
-                                                    }));
-    },
-
-    _updateSensitivity: function(sensitive) {
-        this._promptEntry.reactive = sensitive;
-        this._promptEntry.clutter_text.editable = sensitive;
-        this._sessionList.updateSensitivity(sensitive);
-        this._updateSignInButtonSensitivity(sensitive);
-    },
-
-    _updateSignInButtonSensitivity: function(sensitive) {
-        if (this._signInButton) {
-            this._signInButton.reactive = sensitive;
-            this._signInButton.can_focus = sensitive;
-        }
-    },
-
     _hidePrompt: function() {
         this.setButtons([]);
 
-        if (this._promptEntryTextChangedId > 0) {
-            this._promptEntry.clutter_text.disconnect(this._promptEntryTextChangedId);
-            this._promptEntryTextChangedId = 0;
-        }
-
         let tasks = [function() {
-                         this._setWorking(false);
-
                          return GdmUtil.fadeOutActor(this._promptBox);
                      },
 
                      function() {
                          this._promptLoginHint.hide();
-
-                         this._updateSensitivity(true);
+                         this._promptEntry.reactive = true;
                          this._promptEntry.set_text('');
-
-                         this.clearButtons();
-                         this._workSpinner = null;
-                         this._signInButton = null;
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -1037,46 +940,18 @@ const LoginDialog = new Lang.Class({
         return batch.run();
     },
 
-    _setWorking: function(working) {
-        if (!this._workSpinner)
-            return;
-
-        if (working) {
-            this._workSpinner.play();
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 255,
-                               delay: WORK_SPINNER_ANIMATION_DELAY,
-                               time: WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear'
-                             });
-        } else {
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 0,
-                               time: WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear',
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   this._workSpinner.stop();
-                               }
-                             });
-        }
-    },
-
     _askQuestion: function(verifier, serviceName, question, passwordChar) {
         this._promptLabel.set_text(question);
 
         this._promptEntry.set_text('');
         this._promptEntry.clutter_text.set_password_char(passwordChar);
 
-        let tasks = [function() {
-                         return this._showPrompt(!!passwordChar);
-                     },
+        let tasks = [this._showPrompt,
 
                      function() {
-                         let text = this._promptEntry.get_text();
-                         this._updateSensitivity(false);
-                         this._setWorking(true);
-                         this._userVerifier.answerQuery(serviceName, text);
+                         let _text = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         this._userVerifier.answerQuery(serviceName, _text);
                      }];
 
         let batch = new Batch.ConsecutiveBatch(this, tasks);
@@ -1242,7 +1117,8 @@ const LoginDialog = new Lang.Class({
                      },
 
                      new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
-                                                      this._fadeOutNotListedButton]),
+                                                      this._fadeOutNotListedButton,
+                                                      this._fadeOutLogo]),
 
                      function() {
                          return this._askForUsernameAndLogIn();
@@ -1252,11 +1128,20 @@ const LoginDialog = new Lang.Class({
         batch.run();
     },
 
+    _fadeInLogo: function() {
+        return GdmUtil.fadeInActor(this._logoBox);
+    },
+
+    _fadeOutLogo: function() {
+        return GdmUtil.fadeOutActor(this._logoBox);
+    },
+
     _showUserList: function() {
         let tasks = [this._hidePrompt,
 
                      new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
-                                                      this._fadeInNotListedButton]),
+                                                      this._fadeInNotListedButton,
+                                                      this._fadeInLogo]),
 
                      function() {
                          this._sessionList.close();
@@ -1324,7 +1209,8 @@ const LoginDialog = new Lang.Class({
                      },
 
                      new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
-                                                      this._fadeOutNotListedButton]),
+                                                      this._fadeOutNotListedButton,
+                                                      this._fadeOutLogo]),
 
                      function() {
                          return this._userList.shrinkToNaturalHeight();

js/gdm/powerMenu.js

@@ -18,12 +18,11 @@
  * 02111-1307, USA.
  */
 
-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
+const UPowerGlib = imports.gi.UPowerGlib;
 
 const LoginManager = imports.misc.loginManager;
 
-const GdmUtil = imports.gdm.util;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
@@ -34,15 +33,16 @@ const PowerMenuButton = new Lang.Class({
     _init: function() {
         /* Translators: accessible name of the power menu in the login screen */
         this.parent('system-shutdown-symbolic', _("Power"));
+        this._upClient = new UPowerGlib.Client();
 
         this._loginManager = LoginManager.getLoginManager();
 
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed::disable-restart-buttons',
-                               Lang.bind(this, this._updateVisibility));
-
         this._createSubMenu();
 
+        this._upClient.connect('notify::can-suspend',
+                               Lang.bind(this, this._updateHaveSuspend));
+        this._updateHaveSuspend();
+
         // ConsoleKit doesn't send notifications when shutdown/reboot
         // are disabled, so we update the menu item each time the menu opens
         this.menu.connect('open-state-changed', Lang.bind(this,
@@ -50,17 +50,15 @@ const PowerMenuButton = new Lang.Class({
                 if (open) {
                     this._updateHaveShutdown();
                     this._updateHaveRestart();
-                    this._updateHaveSuspend();
                 }
             }));
         this._updateHaveShutdown();
         this._updateHaveRestart();
-        this._updateHaveSuspend();
     },
 
     _updateVisibility: function() {
         let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
-        this.actor.visible = shouldBeVisible && !this._settings.get_boolean('disable-restart-buttons');
+        this.actor.visible = shouldBeVisible;
     },
 
     _updateHaveShutdown: function() {
@@ -80,11 +78,9 @@ const PowerMenuButton = new Lang.Class({
     },
 
     _updateHaveSuspend: function() {
-        this._loginManager.canSuspend(Lang.bind(this, function(result) {
-            this._haveSuspend = result;
-            this._suspendItem.actor.visible = this._haveSuspend;
-            this._updateVisibility();
-        }));
+        this._haveSuspend = this._upClient.get_can_suspend();
+        this._suspendItem.actor.visible = this._haveSuspend;
+        this._updateVisibility();
     },
 
     _createSubMenu: function() {
@@ -107,10 +103,8 @@ const PowerMenuButton = new Lang.Class({
     },
 
     _onActivateSuspend: function() {
-        if (!this._haveSuspend)
-            return;
-
-        this._loginManager.suspend();
+        if (this._haveSuspend)
+            this._upClient.suspend_sync(null);
     },
 
     _onActivateRestart: function() {

js/misc/extensionUtils.js

@@ -11,7 +11,6 @@ const Gio = imports.gi.Gio;
 const ShellJS = imports.gi.ShellJS;
 
 const Config = imports.misc.config;
-const FileUtils = imports.misc.fileUtils;
 
 const ExtensionType = {
     SYSTEM: 1,
@@ -151,35 +150,53 @@ function installImporter(extension) {
 const ExtensionFinder = new Lang.Class({
     Name: 'ExtensionFinder',
 
-    _loadExtension: function(extensionDir, info, perUserDir) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            return;
-        let uuid = info.get_name();
-        let existing = extensions[uuid];
-        if (existing) {
-            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
+    _scanExtensionsInDirectory: function(dir, type) {
+        let fileEnum;
+        let file, info;
+        try {
+            fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
+        } catch(e) {
+            if (e.domain != Gio.io_error_quark() || e.code != Gio.IOErrorEnum.NOT_FOUND)
+                logError(e, 'Could not enumerate extensions directory');
             return;
         }
 
-        let extension;
-        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
-                                                       : ExtensionType.SYSTEM;
-        try {
-            extension = createExtensionObject(uuid, extensionDir, type);
-        } catch(e) {
-            logError(e, 'Could not load extension %s'.format(uuid));
-            return;
+        while ((info = fileEnum.next_file(null)) != null) {
+            let fileType = info.get_file_type();
+            if (fileType != Gio.FileType.DIRECTORY)
+                continue;
+            let uuid = info.get_name();
+            let extensionDir = dir.get_child(uuid);
+
+            let existing = extensions[uuid];
+            if (existing) {
+                log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
+                continue;
+            }
+
+            let extension;
+            try {
+                extension = createExtensionObject(uuid, extensionDir, type);
+            } catch(e) {
+                logError(e, 'Could not load extension %s'.format(uuid));
+                continue;
+            }
+            this.emit('extension-found', extension);
         }
-        this.emit('extension-found', extension);
+        fileEnum.close(null);
     },
 
     scanExtensions: function() {
-        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirsAsync('extensions',
-                                           { processFile: Lang.bind(this, this._loadExtension),
-                                             includeUserDir: true,
-                                             data: perUserDir });
+        let userExtensionsDir = Gio.File.new_for_path(GLib.build_filenamev([global.userdatadir, 'extensions']));
+        this._scanExtensionsInDirectory(userExtensionsDir, ExtensionType.PER_USER);
+
+        let systemDataDirs = GLib.get_system_data_dirs();
+        for (let i = 0; i < systemDataDirs.length; i++) {
+            let dirPath = GLib.build_filenamev([systemDataDirs[i], 'gnome-shell', 'extensions']);
+            let dir = Gio.file_new_for_path(dirPath);
+            if (dir.query_exists(null))
+                this._scanExtensionsInDirectory(dir, ExtensionType.SYSTEM);
+        }
     }
 });
 Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -2,12 +2,10 @@
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;
 
 function listDirAsync(file, callback) {
     let allFiles = [];
-    file.enumerate_children_async('standard::name,standard::type',
+    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
                                   Gio.FileQueryInfoFlags.NONE,
                                   GLib.PRIORITY_LOW, null, function (obj, res) {
         let enumerator = obj.enumerate_children_finish(res);
@@ -25,63 +23,6 @@ function listDirAsync(file, callback) {
     });
 }
 
-function _collectFromDirectoryAsync(dir, loadState) {
-    function done() {
-        loadState.numLoading--;
-        if (loadState.loadedCallback &&
-            loadState.numLoading == 0)
-            loadState.loadedCallback(loadState.data);
-    }
-
-    dir.query_info_async('standard::type', Gio.FileQueryInfoFlags.NONE,
-        GLib.PRIORITY_DEFAULT, null, function(object, res) {
-            try {
-                object.query_info_finish(res);
-            } catch (e) {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    log(e.message);
-                done();
-                return;
-            }
-
-            listDirAsync(dir, Lang.bind(this, function(infos) {
-                for (let i = 0; i < infos.length; i++)
-                    loadState.processFile(dir.get_child(infos[i].get_name()),
-                                          infos[i], loadState.data);
-                done();
-            }));
-        });
-}
-
-function collectFromDatadirsAsync(subdir, params) {
-    params = Params.parse(params, { includeUserDir: false,
-                                    processFile: null,
-                                    loadedCallback: null,
-                                    data: null });
-    let loadState = { data: params.data,
-                      numLoading: 0,
-                      loadedCallback: params.loadedCallback,
-                      processFile: params.processFile };
-
-    if (params.processFile == null) {
-        if (params.loadedCallback)
-            params.loadedCallback(params.data);
-        return;
-    }
-
-    let dataDirs = GLib.get_system_data_dirs();
-    if (params.includeUserDir)
-        dataDirs.unshift(GLib.get_user_data_dir());
-    loadState.numLoading = dataDirs.length;
-
-    for (let i = 0; i < dataDirs.length; i++) {
-        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
-        let dir = Gio.File.new_for_path(path);
-
-        _collectFromDirectoryAsync(dir, loadState);
-    }
-}
-
 function deleteGFile(file) {
     // Work around 'delete' being a keyword in JS.
     return file['delete'](null);

js/misc/loginManager.js

@@ -3,9 +3,7 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const UPowerGlib = imports.gi.UPowerGlib;
 
 const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
 <method name='PowerOff'>
@@ -14,18 +12,12 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='Reboot'>
     <arg type='b' direction='in'/>
 </method>
-<method name='Suspend'>
-    <arg type='b' direction='in'/>
-</method>
 <method name='CanPowerOff'>
     <arg type='s' direction='out'/>
 </method>
 <method name='CanReboot'>
     <arg type='s' direction='out'/>
 </method>
-<method name='CanSuspend'>
-    <arg type='s' direction='out'/>
-</method>
 </interface>;
 
 const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
@@ -131,25 +123,12 @@ const LoginManagerSystemd = new Lang.Class({
         });
     },
 
-    canSuspend: function(asyncCallback) {
-        this._proxy.CanSuspendRemote(function(result, error) {
-            if (error)
-                asyncCallback(false);
-            else
-                asyncCallback(result[0] != 'no');
-        });
-    },
-
     powerOff: function() {
         this._proxy.PowerOffRemote(true);
     },
 
     reboot: function() {
         this._proxy.RebootRemote(true);
-    },
-
-    suspend: function() {
-        this._proxy.SuspendRemote(true);
     }
 });
 
@@ -160,7 +139,6 @@ const LoginManagerConsoleKit = new Lang.Class({
         this._proxy = new ConsoleKitManager(Gio.DBus.system,
                                             'org.freedesktop.ConsoleKit',
                                             '/org/freedesktop/ConsoleKit/Manager');
-        this._upClient = new UPowerGlib.Client();
     },
 
     // Having this function is a bit of a hack since the Systemd and ConsoleKit
@@ -208,22 +186,12 @@ const LoginManagerConsoleKit = new Lang.Class({
         });
     },
 
-    canSuspend: function(asyncCallback) {
-        Mainloop.idle_add(Lang.bind(this, function() {
-            asyncCallback(this._upClient.get_can_suspend());
-            return false;
-        }));
-    },
-
     powerOff: function() {
         this._proxy.StopRemote();
     },
 
     reboot: function() {
         this._proxy.RestartRemote();
-    },
-
-    suspend: function() {
-        this._upClient.suspend_sync(null);
     }
+            
 });

js/misc/modemManager.js

@@ -46,70 +46,8 @@ let _providersTable;
 function _getProvidersTable() {
     if (_providersTable)
         return _providersTable;
-    return _providersTable = Shell.mobile_providers_parse(null,null);
-}
-
-function findProviderForMCCMNC(table, needle) {
-    let needlemcc = needle.substring(0, 3);
-    let needlemnc = needle.substring(3, needle.length);
-
-    let name2, name3;
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-
-            // Search through MCC/MNC list
-            let list = provider.get_gsm_mcc_mnc();
-            for (let j = 0; j < list.length; j++) {
-                let mccmnc = list[j];
-
-                // Match both 2-digit and 3-digit MNC; prefer a
-                // 3-digit match if found, otherwise a 2-digit one.
-                if (mccmnc.mcc != needlemcc)
-                    continue;  // MCC was wrong
-
-                if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                    name3 = provider.name;
-
-                if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                    name2 = provider.name;
-
-                if (name2 && name3)
-                    break;
-            }
-        }
-    }
-
-    return name3 || name2 || null;
-}
-
-function findProviderForSid(table, sid) {
-    if (sid == 0)
-        return null;
-
-    // Search through each country
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-            let cdma_sid = provider.get_cdma_sid();
-
-            // Search through CDMA SID list
-            for (let j = 0; j < cdma_sid.length; j++) {
-                if (cdma_sid[j] == sid)
-                    return provider.name;
-            }
-        }
-    }
-
-    return null;
+    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = providers;
 }
 
 const ModemGsm = new Lang.Class({
@@ -153,29 +91,64 @@ const ModemGsm = new Lang.Class({
     },
 
     _findOperatorName: function(name, opCode) {
-        if (name) {
-            if (name && name.length != 0 && (name.length > 6 || name.length < 5)) {
-                // this looks like a valid name, i.e. not an MCCMNC (that some
-                // devices return when not yet connected
-                return name;
-            }
-            if (isNaN(parseInt(name))) {
-                // name is definitely not a MCCMNC, so it may be a name
-                // after all; return that
-                return name;
-            }
+        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return name;
+        }
+        if (isNaN(parseInt(name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return name;
         }
 
         let needle;
-        if ((name == null || name.length == 0) && opCode)
+        if (name.length == 0 && opCode)
             needle = opCode;
         else if (name.length == 6 || name.length == 5)
             needle = name;
         else // nothing to search
             return null;
 
+        return this._findProviderForMCCMNC(needle);
+    },
+
+    _findProviderForMCCMNC: function(needle) {
         let table = _getProvidersTable();
-        return findProviderForMCCMNC(table, needle);
+        let needlemcc = needle.substring(0, 3);
+        let needlemnc = needle.substring(3, needle.length);
+
+        let name2, name3;
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+
+                // Search through MCC/MNC list
+                let list = provider.get_gsm_mcc_mnc();
+                for (let j = 0; j < list.length; j++) {
+                    let mccmnc = list[j];
+
+                    // Match both 2-digit and 3-digit MNC; prefer a
+                    // 3-digit match if found, otherwise a 2-digit one.
+                    if (mccmnc.mcc != needlemcc)
+                        continue;  // MCC was wrong
+
+                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                        name3 = provider.name;
+
+                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                        name2 = provider.name;
+
+                    if (name2 && name3)
+                        break;
+                }
+            }
+        }
+
+        return name3 || name2 || null;
     }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@@ -216,14 +189,39 @@ const ModemCdma = new Lang.Class({
                 this.operator_name = null;
             } else {
                 let [bandClass, band, id] = result;
-                if (name.length > 0) {
-                    let table = _getProvidersTable();
-                    this.operator_name = findProviderForSid(table, id);
-                } else
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
                     this.operator_name = null;
             }
             this.emit('notify::operator-name');
         }));
+    },
+
+    _findProviderForSid: function(sid) {
+        if (sid == 0)
+            return null;
+
+        let table = _getProvidersTable();
+
+        // Search through each country
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+                let cdma_sid = provider.get_cdma_sid();
+
+                // Search through CDMA SID list
+                for (let j = 0; j < cdma_sid.length; j++) {
+                    if (cdma_sid[j] == sid)
+                        return provider.name;
+                }
+            }
+        }
+
+        return null;
     }
 });
 Signals.addSignalMethods(ModemCdma.prototype);

js/misc/util.js

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

js/ui/appDisplay.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const GMenu = imports.gi.GMenu;
@@ -19,6 +18,7 @@ const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
+const Search = imports.ui.search;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 const Params = imports.misc.params;
@@ -48,16 +48,18 @@ const AlphabeticalView = new Lang.Class({
                                          style_class: 'vfade' });
         this.actor.add_actor(box);
         this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        let action = new Clutter.PanAction({ interpolate: true });
-        action.connect('pan', Lang.bind(this, this._onPan));
-        this.actor.add_action(action);
-    },
+        this.actor.connect('notify::mapped', Lang.bind(this,
+            function() {
+                if (!this.actor.mapped)
+                    return;
 
-    _onPan: function(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
-        let adjustment = this.actor.vscroll.adjustment;
-        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
-        return false;
+                let adjustment = this.actor.vscroll.adjustment;
+                let direction = Overview.SwipeScrollDirection.VERTICAL;
+                Main.overview.setScrollAdjustment(adjustment, direction);
+
+                // Reset scroll on mapping
+                adjustment.value = 0;
+            }));
     },
 
     removeAll: function() {
@@ -214,16 +216,6 @@ const ViewByCategories = new Lang.Class({
     },
 
     _addCategory: function(name, index, dir) {
-        let apps;
-
-        if (dir != null) {
-            apps = [];
-            this._loadCategory(dir, apps);
-
-            if (apps.length == 0)
-                return false;
-        }
-
         let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
                                      style_class: 'app-filter',
                                      x_align: St.Align.START,
@@ -233,16 +225,18 @@ const ViewByCategories = new Lang.Class({
             this._selectCategory(index);
         }));
 
+        var apps;
         if (dir == null) {
             this._allCategoryButton = button;
         } else {
+            apps = [];
+            this._loadCategory(dir, apps);
             this._categories.push({ apps: apps,
                                     name: name,
                                     button: button });
         }
 
         this._categoryBox.add(button, { expand: true, x_fill: true, y_fill: false });
-        return true;
     },
 
     _removeAll: function() {
@@ -268,9 +262,8 @@ const ViewByCategories = new Lang.Class({
                 var dir = iter.get_directory();
                 if (dir.get_is_nodisplay())
                     continue;
-
-                if (this._addCategory(dir.get_name(), i, dir))
-                    i++;
+                this._addCategory(dir.get_name(), i, dir);
+                i++;
             }
         }
 
@@ -311,10 +304,11 @@ const AllAppDisplay = new Lang.Class({
 
 const AppSearchProvider = new Lang.Class({
     Name: 'AppSearchProvider',
+    Extends: Search.SearchProvider,
 
     _init: function() {
+        this.parent(_("APPLICATIONS"));
         this._appSys = Shell.AppSystem.get_default();
-        this.id = 'applications';
     },
 
     getResultMetas: function(apps, callback) {
@@ -339,15 +333,18 @@ const AppSearchProvider = new Lang.Class({
         this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
     },
 
-    activateResult: function(app) {
+    activateResult: function(app, params) {
+        params = Params.parse(params, { workspace: -1,
+                                        timestamp: 0 });
+
         let event = Clutter.get_current_event();
         let modifiers = event ? event.get_state() : 0;
         let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
 
         if (openNewWindow)
-            app.open_new_window(-1);
+            app.open_new_window(params.workspace);
         else
-            app.activate();
+            app.activate_full(params.workspace, params.timestamp);
     },
 
     dragActivateResult: function(id, params) {
@@ -367,10 +364,13 @@ const AppSearchProvider = new Lang.Class({
 
 const SettingsSearchProvider = new Lang.Class({
     Name: 'SettingsSearchProvider',
+    Extends: Search.SearchProvider,
 
     _init: function() {
-        this.appInfo = Gio.DesktopAppInfo.new('gnome-control-center.desktop');
+        this.parent(_("SETTINGS"));
+
         this._appSys = Shell.AppSystem.get_default();
+        this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
     },
 
     getResultMetas: function(prefs, callback) {
@@ -379,7 +379,9 @@ const SettingsSearchProvider = new Lang.Class({
             let pref = prefs[i];
             metas.push({ 'id': pref,
                          'name': pref.get_name(),
-                         'createIcon': function() { return null; }
+                         'createIcon': function(size) {
+                             return pref.create_icon_texture(size);
+                         }
                        });
         }
         callback(metas);
@@ -393,13 +395,21 @@ const SettingsSearchProvider = new Lang.Class({
         this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
     },
 
-    activateResult: function(pref) {
-        pref.activate();
+    activateResult: function(pref, params) {
+        params = Params.parse(params, { workspace: -1,
+                                        timestamp: 0 });
+
+        pref.activate_full(params.workspace, params.timestamp);
     },
 
-    launchSearch: function(terms) {
-        // FIXME: this should be a remote search provider
-        this.appInfo.launch([], global.create_app_launch_context());
+    dragActivateResult: function(pref, params) {
+        this.activateResult(pref, params);
+    },
+
+    createResultActor: function (resultMeta, terms) {
+        let app = resultMeta['id'];
+        let icon = new AppWellIcon(app);
+        return icon.actor;
     }
 });
 
@@ -469,6 +479,7 @@ const AppWellIcon = new Lang.Class({
                                                 Lang.bind(this,
                                                           this._onStateChanged));
         this._onStateChanged();
+        this.isMenuUp = false;
     },
 
     _onDestroy: function() {
@@ -550,11 +561,9 @@ const AppWellIcon = new Lang.Class({
             this._menuManager.addMenu(this._menu);
         }
 
-        this.emit('menu-state-changed', true);
-
+        this.isMenuUp = true;
         this.actor.set_hover(true);
         this._menu.popup();
-        this._menuManager.ignoreRelease();
 
         return false;
     },
@@ -569,7 +578,7 @@ const AppWellIcon = new Lang.Class({
 
     _onMenuPoppedDown: function() {
         this.actor.sync_hover();
-        this.emit('menu-state-changed', false);
+        this.isMenuUp = false;
     },
 
     _onActivate: function (event) {

js/ui/appFavorites.js

@@ -84,12 +84,9 @@ const AppFavorites = new Lang.Class({
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._removeFavorite(appId);
-                                                           })
-                                 });
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+            this._removeFavorite(appId);
+        }));
     },
 
     addFavorite: function(appId) {
@@ -119,11 +116,9 @@ const AppFavorites = new Lang.Class({
             return;
 
         Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._addFavorite(appId, pos);
-                                                           })
-                                 });
+                                 Lang.bind(this, function () {
+            this._addFavorite(appId, pos);
+        }));
     }
 });
 Signals.addSignalMethods(AppFavorites.prototype);

js/ui/boxpointer.js

@@ -220,8 +220,25 @@ const BoxPointer = new Lang.Class({
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
-            this._updateFlip();
+            this._reposition(this._sourceActor, this._arrowAlignment);
+
+            if (this._shouldFlip()) {
+                switch (this._arrowSide) {
+                case St.Side.TOP:
+                    this._arrowSide = St.Side.BOTTOM;
+                    break;
+                case St.Side.BOTTOM:
+                    this._arrowSide = St.Side.TOP;
+                    break;
+                case St.Side.LEFT:
+                    this._arrowSide = St.Side.RIGHT;
+                    break;
+                case St.Side.RIGHT:
+                    this._arrowSide = St.Side.LEFT;
+                    break;
+                }
+                this._reposition(this._sourceActor, this._arrowAlignment);
+            }
         }
     },
 
@@ -388,11 +405,11 @@ const BoxPointer = new Lang.Class({
             cr.setLineWidth(borderWidth);
             cr.stroke();
         }
-
-        cr.$dispose();
     },
 
     setPosition: function(sourceActor, alignment) {
+        this._arrowSide = this._userArrowSide;
+
         // We need to show it now to force an allocation,
         // so that we can query the correct size.
         this.actor.show();
@@ -400,8 +417,7 @@ const BoxPointer = new Lang.Class({
         this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this._reposition();
-        this._updateFlip();
+        this._reposition(sourceActor, alignment);
     },
 
     setSourceAlignment: function(alignment) {
@@ -413,10 +429,7 @@ const BoxPointer = new Lang.Class({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     },
 
-    _reposition: function() {
-        let sourceActor = this._sourceActor;
-        let alignment = this._arrowAlignment;
-
+    _reposition: function(sourceActor, alignment) {
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
@@ -540,7 +553,7 @@ const BoxPointer = new Lang.Class({
     _shiftActor : function() {
         // Since the position of the BoxPointer depends on the allocated size
         // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPointer via the x/y properties will result in
+        // to position the BoxPoiner via the x/y properties will result in
         // allocation loops and warnings. Instead we do the positioning via
         // the anchor point, which is independent of allocation, and leave
         // x == y == 0.
@@ -548,47 +561,37 @@ const BoxPointer = new Lang.Class({
                                     -(this._yPosition + this._yOffset));
     },
 
-    _calculateArrowSide: function(arrowSide) {
+    _shouldFlip: function() {
         let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
-        let [minWidth, minHeight, boxWidth, boxHeight] = this._container.get_preferred_size();
+        let boxAllocation = Shell.util_get_transformed_allocation(this.actor);
+        let boxWidth = boxAllocation.x2 - boxAllocation.x1;
+        let boxHeight = boxAllocation.y2 - boxAllocation.y1;
         let monitor = Main.layoutManager.findMonitorForActor(this.actor);
 
-        switch (arrowSide) {
+        switch (this._arrowSide) {
         case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
+            if (boxAllocation.y2 > monitor.y + monitor.height &&
                 boxHeight < sourceAllocation.y1 - monitor.y)
-                return St.Side.BOTTOM;
+                return true;
             break;
         case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < monitor.y &&
+            if (boxAllocation.y1 < monitor.y &&
                 boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
-                return St.Side.TOP;
+                return true;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.y2 + boxWidth > monitor.x + monitor.width &&
+            if (boxAllocation.x2 > monitor.x + monitor.width &&
                 boxWidth < sourceAllocation.x1 - monitor.x)
-                return St.Side.RIGHT;
+                return true;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.y1 - boxWidth < monitor.x &&
+            if (boxAllocation.x1 < monitor.x &&
                 boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
-                return St.Side.LEFT;
+                return true;
             break;
         }
 
-        return arrowSide;
-    },
-
-    _updateFlip: function() {
-        let arrowSide = this._calculateArrowSide(this._userArrowSide);
-        if (this._arrowSide != arrowSide) {
-            this._arrowSide = arrowSide;
-            this._reposition();
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._container.queue_relayout();
-                return false;
-            }));
-        }
+        return false;
     },
 
     set xOffset(offset) {

js/ui/calendar.js

@@ -11,6 +11,7 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
+const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 
 // in org.gnome.desktop.interface
@@ -94,6 +95,15 @@ function _getCalendarWeekForDate(date) {
     return weekNumber;
 }
 
+function _getDigitWidth(actor){
+    let context = actor.get_pango_context();
+    let themeNode = actor.get_theme_node();
+    let font = themeNode.get_font();
+    let metrics = context.get_metrics(font, context.get_language());
+    let width = metrics.get_approximate_digit_width();
+    return width;
+}
+
 function _getCalendarDayAbbreviation(dayNumber) {
     let abbreviations = [
         /* Translators: Calendar grid abbreviation for Sunday.
@@ -260,9 +270,8 @@ const DBusEventSource = new Lang.Class({
         this._loadEvents(false);
     },
 
-    _onEventsReceived: function(results, error) {
+    _onEventsReceived: function([appointments]) {
         let newEvents = [];
-        let appointments = results ? results[0] : null;
         if (appointments != null) {
             for (let n = 0; n < appointments.length; n++) {
                 let a = appointments[n];
@@ -335,6 +344,8 @@ const Calendar = new Lang.Class({
 
     _init: function() {
         this._weekStart = Shell.util_get_week_start();
+        this._weekdate = NaN;
+        this._digitWidth = NaN;
         this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
 
         this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
@@ -407,6 +418,8 @@ const Calendar = new Lang.Class({
         this.actor.add(this._topBox,
                        { row: 0, col: 0, col_span: offsetCols + 7 });
 
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
+
         let back = new St.Button({ style_class: 'calendar-change-month-back' });
         this._topBox.add(back);
         back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
@@ -443,6 +456,18 @@ const Calendar = new Lang.Class({
         this._firstDayIndex = this.actor.get_n_children();
     },
 
+    _onStyleChange: function(actor, event) {
+        // width of a digit in pango units
+        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
+        this._setWeekdateHeaderWidth();
+    },
+
+    _setWeekdateHeaderWidth: function() {
+        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
+            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
+        }
+    },
+
     _onScroll : function(actor, event) {
         switch (event.get_scroll_direction()) {
         case Clutter.ScrollDirection.UP:

js/ui/components/autorunManager.js

@@ -45,12 +45,14 @@ function isMountRootHidden(root) {
 }
 
 function isMountNonLocal(mount) {
-    // If the mount doesn't have an associated volume, that means it's
-    // an uninteresting filesystem. Most devices that we care about will
-    // have a mount, like media players and USB sticks.
+    // If the mount doesn't have an associated volume, that means it could
+    // be a remote filesystem. For certain kinds of local filesystems,
+    // like digital cameras and music players, there's no associated
+    // gvfs volume, so err on the side of caution and assume it's a local
+    // filesystem to allow the prompt.
     let volume = mount.get_volume();
     if (volume == null)
-        return true;
+        return false;
 
     return (volume.get_identifier("class") == "network");
 }
@@ -544,8 +546,9 @@ const AutorunTransientSource = new Lang.Class({
         this.notify(this._notification);
     },
 
-    getIcon: function() {
-        return this.mount.get_icon();
+    createIcon: function(size) {
+        return new St.Icon({ gicon: this.mount.get_icon(),
+                             icon_size: size });
     }
 });
 

js/ui/components/keyring.js

@@ -60,14 +60,18 @@ const KeyringDialog = new Lang.Class({
 
         this._controlTable = null;
 
+        let buttons = [{ label: '',
+                         action: Lang.bind(this, this._onCancelButton),
+                         key:    Clutter.Escape
+                       },
+                       { label: '',
+                         action: Lang.bind(this, this._onContinueButton),
+                         default: true
+                       }]
 
-        this._cancelButton = this.addButton({ label: '',
-                                              action: Lang.bind(this, this._onCancelButton),
-                                              key: Clutter.Escape });
-        this._continueButton = this.addButton({ label: '',
-                                                action: Lang.bind(this, this._onContinueButton),
-                                                default: true },
-                                              { expand: true, x_fill: false, x_align: St.Align.END });
+        this.setButtons(buttons);
+        this._cancelButton = buttons[0].button;
+        this._continueButton = buttons[1].button;
 
         this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
@@ -142,14 +146,6 @@ const KeyringDialog = new Lang.Class({
         this._messageBox.add(table, { x_fill: true, y_fill: true });
     },
 
-    _updateSensitivity: function(sensitive) {
-        this._passwordEntry.reactive = sensitive;
-        this._passwordEntry.clutter_text.editable = sensitive;
-
-        this._continueButton.can_focus = sensitive;
-        this._continueButton.reactive = sensitive;
-    },
-
     _ensureOpen: function() {
         // NOTE: ModalDialog.open() is safe to call if the dialog is
         // already open - it just returns true without side-effects
@@ -171,14 +167,12 @@ const KeyringDialog = new Lang.Class({
     _onShowPassword: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
-        this._updateSensitivity(true);
         this._passwordEntry.grab_key_focus();
     },
 
     _onShowConfirm: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
-        this._updateSensitivity(true);
         this._continueButton.grab_key_focus();
     },
 
@@ -198,7 +192,6 @@ const KeyringDialog = new Lang.Class({
     },
 
     _onContinueButton: function() {
-        this._updateSensitivity(false);
         this.prompt.complete();
     },
 

js/ui/components/networkAgent.js

@@ -598,7 +598,7 @@ const NetworkAgent = new Lang.Class({
     },
 
     enable: function() {
-        this._native.auto_register = true;
+        this._native.register();
     },
 
     disable: function() {
@@ -612,9 +612,7 @@ const NetworkAgent = new Lang.Class({
             this._vpnRequests[requestId].cancel(true);
         this._vpnRequests = { };
 
-        this._native.auto_register = false;
-        if (this._native.registered)
-            this._native.unregister();
+        this._native.unregister();
     },
 
     _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {

js/ui/components/polkitAgent.js

@@ -159,13 +159,14 @@ const AuthenticationDialog = new Lang.Class({
         messageBox.add(this._nullMessageLabel);
         this._nullMessageLabel.show();
 
-        this._cancelButton = this.addButton({ label: _("Cancel"),
-                                              action: Lang.bind(this, this.cancel),
-                                              key: Clutter.Escape });
-        this._okButton = this.addButton({ label:  _("Authenticate"),
-                                          action: Lang.bind(this, this._onAuthenticateButtonPressed),
-                                          default: true },
-                                        { expand: true, x_fill: false, x_align: St.Align.END });
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this.cancel),
+                           key:    Clutter.Escape
+                         },
+                         { label:  _("Authenticate"),
+                           action: Lang.bind(this, this._onAuthenticateButtonPressed),
+                           default: true
+                         }]);
 
         this._doneEmitted = false;
 
@@ -213,17 +214,8 @@ const AuthenticationDialog = new Lang.Class({
         }
     },
 
-    _updateSensitivity: function(sensitive) {
-        this._passwordEntry.reactive = sensitive;
-        this._passwordEntry.clutter_text.editable = sensitive;
-
-        this._okButton.can_focus = sensitive;
-        this._okButton.reactive = sensitive;
-    },
-
     _onEntryActivate: function() {
         let response = this._passwordEntry.get_text();
-        this._updateSensitivity(false);
         this._session.response(response);
         // When the user responds, dismiss already shown info and
         // error texts (if any)
@@ -277,7 +269,6 @@ const AuthenticationDialog = new Lang.Class({
         this._passwordBox.show();
         this._passwordEntry.set_text('');
         this._passwordEntry.grab_key_focus();
-        this._updateSensitivity(true);
         this._ensureOpen();
     },
 

js/ui/components/recorder.js

@@ -1,6 +1,5 @@
 
 const Lang = imports.lang;
-const Main = imports.ui.main;
 
 const Gio = imports.gi.Gio;
 const Meta = imports.gi.Meta;
@@ -17,16 +16,13 @@ const Recorder = new Lang.Class({
     },
 
     enable: function() {
-        Main.wm.addKeybinding('toggle-recording',
-                              this._bindingSettings,
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._toggleRecorder));
+        global.display.add_keybinding('toggle-recording',
+                                      this._bindingSettings,
+                                      Meta.KeyBindingFlags.NONE, Lang.bind(this, this._toggleRecorder));
     },
 
     disable: function() {
-        Main.wm.removeKeybinding('toggle-recording');
+        global.display.remove_keybinding('toggle-recording');
     },
 
     _ensureRecorder: function() {
@@ -45,7 +41,7 @@ const Recorder = new Lang.Class({
             recorder.set_framerate(this._recorderSettings.get_int('framerate'));
             /* Translators: this is a filename used for screencast recording */
             // xgettext:no-c-format
-            recorder.set_file_template(_("Screencast from %d %t") + '.' + this._recorderSettings.get_string('file-extension'));
+            recorder.set_filename(_("Screencast from %d %t") + '.' + this._recorderSettings.get_string('file-extension'));
             let pipeline = this._recorderSettings.get_string('pipeline');
 
             if (!pipeline.match(/^\s*$/))

js/ui/components/telepathyClient.js

@@ -383,12 +383,25 @@ const TelepathyClient = new Lang.Class({
         }
 
         /* Display notification to ask user to accept/reject request */
-        let source = this._ensureAppSource();
+        let source = this._ensureSubscriptionSource();
 
         let notif = new SubscriptionRequestNotification(source, contact);
         source.notify(notif);
     },
 
+    _ensureSubscriptionSource: function() {
+        if (this._subscriptionSource == null) {
+            this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
+                                                              'gtk-dialog-question');
+            Main.messageTray.add(this._subscriptionSource);
+            this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
+                this._subscriptionSource = null;
+            }));
+        }
+
+        return this._subscriptionSource;
+    },
+
     _accountConnectionStatusNotifyCb: function(account) {
         let connectionError = account.connection_error;
 
@@ -402,7 +415,7 @@ const TelepathyClient = new Lang.Class({
             return;
 
         /* Display notification that account failed to connect */
-        let source = this._ensureAppSource();
+        let source = this._ensureAccountSource();
 
         notif = new AccountNotification(source, account, connectionError);
         this._accountNotifications[account.get_object_path()] = notif;
@@ -412,16 +425,17 @@ const TelepathyClient = new Lang.Class({
         source.notify(notif);
     },
 
-    _ensureAppSource: function() {
-        if (this._appSource == null) {
-            this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
-            Main.messageTray.add(this._appSource);
-            this._appSource.connect('destroy', Lang.bind(this, function () {
-                this._appSource = null;
+    _ensureAccountSource: function() {
+        if (this._accountSource == null) {
+            this._accountSource = new MessageTray.Source(_("Connection error"),
+                                                         'gtk-dialog-error');
+            Main.messageTray.add(this._accountSource);
+            this._accountSource.connect('destroy', Lang.bind(this, function () {
+                this._accountSource = null;
             }));
         }
 
-        return this._appSource;
+        return this._accountSource;
     }
 });
 
@@ -478,7 +492,7 @@ const ChatSource = new Lang.Class({
         }));
         item.connect('activate', Lang.bind(this, function() {
             this.setMuted(!this.isMuted);
-            this.emit('done-displaying-content', false);
+            this.emit('done-displaying-content');
         }));
         rightClickMenu.add(item.actor);
         return rightClickMenu;
@@ -495,42 +509,51 @@ const ChatSource = new Lang.Class({
         this._notification.appendAliasChange(oldAlias, newAlias);
     },
 
-    getIcon: function() {
+    createIcon: function(size) {
+        this._iconBox = new St.Bin({ style_class: 'avatar-box' });
+        this._iconBox._size = size;
+        let textureCache = St.TextureCache.get_default();
         let file = this._contact.get_avatar_file();
+
         if (file) {
-            return new Gio.FileIcon({ file: file });
+            let uri = file.get_uri();
+            this._iconBox.child = textureCache.load_uri_async(uri, this._iconBox._size, this._iconBox._size);
         } else {
-            return new Gio.ThemedIcon({ name: 'avatar-default' });
+            this._iconBox.child = new St.Icon({ icon_name: 'avatar-default',
+                                                icon_size: this._iconBox._size });
         }
+
+        return this._iconBox;
     },
 
-    getSecondaryIcon: function() {
-        let iconName;
+    createSecondaryIcon: function() {
+        let iconBox = new St.Bin();
+        iconBox.child = new St.Icon({ style_class: 'secondary-icon' });
         let presenceType = this._contact.get_presence_type();
 
         switch (presenceType) {
             case Tp.ConnectionPresenceType.AVAILABLE:
-                iconName = 'user-available';
+                iconBox.child.icon_name = 'user-available';
                 break;
             case Tp.ConnectionPresenceType.BUSY:
-                iconName = 'user-busy';
+                iconBox.child.icon_name = 'user-busy';
                 break;
             case Tp.ConnectionPresenceType.OFFLINE:
-                iconName = 'user-offline';
+                iconBox.child.icon_name = 'user-offline';
                 break;
             case Tp.ConnectionPresenceType.HIDDEN:
-                iconName = 'user-invisible';
+                iconBox.child.icon_name = 'user-invisible';
                 break;
             case Tp.ConnectionPresenceType.AWAY:
-                iconName = 'user-away';
+                iconBox.child.icon_name = 'user-away';
                 break;
             case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                iconName = 'user-idle';
+                iconBox.child.icon_name = 'user-idle';
                 break;
             default:
-                iconName = 'user-offline';
+                iconBox.child.icon_name = 'user-offline';
        }
-       return new Gio.ThemedIcon({ name: iconName });
+       return iconBox;
     },
 
     _updateAvatarIcon: function() {
@@ -712,7 +735,7 @@ const ChatSource = new Lang.Class({
 
         title = GLib.markup_escape_text(this.title, -1);
 
-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title, null, { customContent: true, secondaryIcon: this.createSecondaryIcon() });
 
         if (message)
             msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';
@@ -730,7 +753,8 @@ const ChatSource = new Lang.Class({
     _ackMessages: function() {
         // Don't clear our messages here, tp-glib will send a
         // 'pending-message-removed' for each one.
-        this._channel.ack_all_pending_messages_async(null);
+        this._channel.ack_all_pending_messages_async(Lang.bind(this, function(src, result) {
+            this._channel.ack_all_pending_messages_finish(result);}));
     }
 });
 
@@ -739,7 +763,7 @@ const ChatNotification = new Lang.Class({
     Extends: MessageTray.Notification,
 
     _init: function(source) {
-        this.parent(source, source.title, null, { customContent: true, secondaryGIcon: source.getSecondaryIcon() });
+        this.parent(source, source.title, null, { customContent: true, secondaryIcon: source.createSecondaryIcon() });
         this.setResident(true);
 
         this._responseEntry = new St.Entry({ style_class: 'chat-response',
@@ -764,7 +788,6 @@ const ChatNotification = new Lang.Class({
         // force a scroll to the bottom if things change while we were at the
         // bottom
         this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
-        this._scrollArea.add_style_class_name('chat-notification-scrollview');
         this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
             if (adjustment.value == this._oldMaxScrollValue)
                 this.scrollTo(St.Side.BOTTOM);
@@ -920,30 +943,24 @@ const ChatNotification = new Lang.Class({
 
         let format;
 
-        // Show only the hour if date is on today
-        if(daysAgo < 1){
-            format = "<b>%H:%M</b>";
-        }
-        // Show the word "Yesterday" and time if date is on yesterday
-        else if(daysAgo <2){
-            /* Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
-            // xgettext:no-c-format
-            format = _("<b>Yesterday</b>, <b>%H:%M</b>");
-        }
         // Show a week day and time if date is in the last week
-        else if (daysAgo < 7) {
-            /* Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
+        if (daysAgo < 1 || (daysAgo < 7 && now.getDay() != date.getDay())) {
+            /* Translators: this is a time format string followed by a date.
+             If applicable, replace %X with a strftime format valid for your
+             locale, without seconds. */
             // xgettext:no-c-format
-            format = _("<b>%A</b>, <b>%H:%M</b>");
+            format = _("Sent at <b>%X</b> on <b>%A</b>");
 
         } else if (date.getYear() == now.getYear()) {
-            /* Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
+            /* Translators: this is a time format in the style of "Wednesday, May 25",
+             shown when you get a chat message in the same year. */
             // xgettext:no-c-format
-            format = _("<b>%B</b> <b>%d</b>, <b>%H:%M</b>");
+            format = _("Sent on <b>%A</b>, <b>%B %d</b>");
         } else {
-            /* Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
+            /* Translators: this is a time format in the style of "Wednesday, May 25, 2012",
+             shown when you get a chat message in a different year. */
             // xgettext:no-c-format
-            format = _("<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> ");
+            format = _("Sent on <b>%A</b>, <b>%B %d</b>, %Y");
         }
 
         return date.toLocaleFormat(format);
@@ -956,7 +973,8 @@ const ChatNotification = new Lang.Class({
         let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
                                        group: 'meta',
                                        styles: ['chat-meta-message'],
-                                       childProps: { expand: true, x_fill: false },
+                                       childProps: { expand: true, x_fill: false,
+                                                     x_align: St.Align.END },
                                        noTimestamp: true,
                                        timestamp: lastMessageTime });
 
@@ -1057,8 +1075,9 @@ const ApproverSource = new Lang.Class({
         this.parent();
     },
 
-    getIcon: function() {
-        return this._gicon;
+    createIcon: function(size) {
+        return new St.Icon({ gicon: this._gicon,
+                             icon_size: size });
     }
 });
 
@@ -1119,7 +1138,7 @@ const AudioVideoNotification = new Lang.Class({
         this.parent(source, title, null, { customContent: true });
         this.setResident(true);
 
-        this.addButton('reject', _("Decline"));
+        this.addButton('reject', _("Reject"));
         /* translators: this is a button label (verb), not a noun */
         this.addButton('answer', _("Answer"));
 
@@ -1336,18 +1355,29 @@ const AccountNotification = new Lang.Class({
         this.parent(source,
                     /* translators: argument is the account name, like
                      * name@jabber.org for example. */
-                    _("Unable to connect to %s").format(account.get_display_name()),
-                    this._getMessage(connectionError));
+                    _("Connection to %s failed").format(account.get_display_name()),
+                    null, { customContent: true });
+
+        this._label = new St.Label();
+        this.addActor(this._label);
+        this._updateMessage(connectionError);
 
         this._account = account;
 
-        this.addButton('view', _("View account"));
+        this.addButton('reconnect', _("Reconnect"));
+        this.addButton('edit', _("Edit account"));
 
         this.connect('action-invoked', Lang.bind(this, function(self, action) {
             switch (action) {
-            case 'view':
-                let cmd = 'empathy-accounts --select-account=' +
-                          account.get_path_suffix();
+            case 'reconnect':
+                // If it fails again, a new notification should pop up with the
+                // new error.
+                account.reconnect_async(null);
+                break;
+            case 'edit':
+                let cmd = '/usr/bin/empathy-accounts'
+                        + ' --select-account=%s'
+                        .format(account.get_path_suffix());
                 let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
                 app_info.launch([], global.create_app_launch_context());
                 break;
@@ -1370,19 +1400,19 @@ const AccountNotification = new Lang.Class({
                 if (status == Tp.ConnectionStatus.CONNECTED) {
                     this.destroy();
                 } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    this.update(this.title, this._getMessage(account.connection_error));
+                    this._updateMessage(account.connection_error);
                 }
             }));
     },
 
-    _getMessage: function(connectionError) {
+    _updateMessage: function(connectionError) {
         let message;
         if (connectionError in _connectionErrorMessages) {
             message = _connectionErrorMessages[connectionError];
         } else {
             message = _("Unknown reason");
         }
-        return message;
+        this._label.set_text(message);
     },
 
     destroy: function() {

js/ui/ctrlAltTab.js

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

js/ui/dash.js

@@ -23,7 +23,8 @@ const DASH_ITEM_HOVER_TIMEOUT = 300;
 
 function getAppFromSource(source) {
     if (source instanceof AppDisplay.AppWellIcon) {
-        return source.app;
+        let appSystem = Shell.AppSystem.get_default();
+        return appSystem.lookup_app(source.getId());
     } else if (source.metaWindow) {
         let tracker = Shell.WindowTracker.get_default();
         return tracker.get_window_app(source.metaWindow);
@@ -491,51 +492,34 @@ const Dash = new Lang.Class({
     },
 
     _createAppItem: function(app) {
-        let appIcon = new AppDisplay.AppWellIcon(app,
+        let display = new AppDisplay.AppWellIcon(app,
                                                  { setSizeManually: true,
                                                    showLabel: false });
-        appIcon._draggable.connect('drag-begin',
+        display._draggable.connect('drag-begin',
                                    Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 50;
+                                       display.actor.opacity = 50;
                                    }));
-        appIcon._draggable.connect('drag-end',
+        display._draggable.connect('drag-end',
                                    Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 255;
+                                       display.actor.opacity = 255;
                                    }));
-        appIcon.connect('menu-state-changed',
-                        Lang.bind(this, function(appIcon, opened) {
-                            this._itemMenuStateChanged(item, opened);
-                        }));
 
         let item = new DashItemContainer();
-        item.setChild(appIcon.actor);
+        item.setChild(display.actor);
 
         // Override default AppWellIcon label_actor, now the
         // accessible_name is set at DashItemContainer.setLabelText
-        appIcon.actor.label_actor = null;
+        display.actor.label_actor = null;
         item.setLabelText(app.get_name());
 
-        appIcon.icon.setIconSize(this.iconSize);
+        display.icon.setIconSize(this.iconSize);
         this._hookUpLabel(item);
 
         return item;
     },
 
-    _itemMenuStateChanged: function(item, opened) {
-        // When the menu closes, it calls sync_hover, which means
-        // that the notify::hover handler does everything we need to.
-        if (opened) {
-            if (this._showLabelTimeoutId > 0) {
-                Mainloop.source_remove(this._showLabelTimeoutId);
-                this._showLabelTimeoutId = 0;
-            }
-
-            item.hideLabel();
-        }
-    },
-
     _onHover: function (item) {
-        if (item.child.get_hover()) {
+        if (item.child.get_hover() && !item.child._delegate.isMenuUp) {
             if (this._showLabelTimeoutId == 0) {
                 let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
                 this._showLabelTimeoutId = Mainloop.timeout_add(timeout,

js/ui/dateMenu.js

@@ -32,7 +32,6 @@ function _onVertSepRepaint (area)
     cr.setDash([1, 3], 1); // Hard-code for now
     cr.setLineWidth(stippleWidth);
     cr.stroke();
-    cr.$dispose();
 };
 
 const DateMenuButton = new Lang.Class({
@@ -84,26 +83,12 @@ const DateMenuButton = new Lang.Class({
                                }));
         vbox.add(this._calendar.actor);
 
-        let separator = new PopupMenu.PopupSeparatorMenuItem();
-        separator.setColumnWidths(1);
-        vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
-        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        this._openCalendarItem.actor.can_focus = false;
-        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
-        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
-        this._openClocksItem.actor.can_focus = false;
-        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        Shell.AppSystem.get_default().connect('installed-changed',
-                                              Lang.bind(this, this._appInstalledChanged));
-        this._appInstalledChanged();
-
         item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
         if (item) {
+            let separator = new PopupMenu.PopupSeparatorMenuItem();
+            separator.setColumnWidths(1);
+            vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
             item.actor.show_on_set_parent = false;
             item.actor.can_focus = false;
             item.actor.reparent(vbox);
@@ -123,6 +108,16 @@ const DateMenuButton = new Lang.Class({
         // Event list
         vbox.add(this._eventList.actor, { expand: true });
 
+        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
+        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        this._openCalendarItem.actor.can_focus = false;
+        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
+        this._calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
+        this._calendarSettings.connect('changed::exec',
+                                       Lang.bind(this, this._calendarSettingsChanged));
+        this._calendarSettingsChanged();
+
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
             if (isOpen) {
@@ -156,9 +151,10 @@ const DateMenuButton = new Lang.Class({
         this._sessionUpdated();
     },
 
-    _appInstalledChanged: function() {
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
-        this._openClocksItem.actor.visible = app !== null;
+    _calendarSettingsChanged: function() {
+        let exec = this._calendarSettings.get_string('exec');
+        let fullExec = GLib.find_program_in_path(exec);
+        this._openCalendarItem.actor.visible = fullExec != null;
     },
 
     _setEventsVisibility: function(visible) {
@@ -209,14 +205,24 @@ const DateMenuButton = new Lang.Class({
 
     _onOpenCalendarActivate: function() {
         this.menu.close();
-
-        let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
-        app.launch([], global.create_app_launch_context());
-    },
-
-    _onOpenClocksActivate: function() {
-        this.menu.close();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
-        app.activate();
+        let tool = this._calendarSettings.get_string('exec');
+        if (tool.length == 0 || tool.substr(0, 9) == 'evolution') {
+            // TODO: pass the selected day
+            let app = Shell.AppSystem.get_default().lookup_app('evolution-calendar.desktop');
+            app.activate();
+        } else {
+            let needTerm = this._calendarSettings.get_boolean('needs-term');
+            if (needTerm) {
+                let terminalSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.terminal' });
+                let term = terminalSettings.get_string('exec');
+                let arg = terminalSettings.get_string('exec-arg');
+                if (arg != '')
+                    Util.spawn([term, arg, tool]);
+                else
+                    Util.spawn([term, tool]);
+            } else {
+                Util.spawnCommandLine(tool)
+            }
+        }
     }
 });

js/ui/dnd.js

@@ -234,7 +234,7 @@ const _Draggable = new Lang.Class({
         this._dragY = this._dragStartY = stageY;
 
         if (this.actor._delegate && this.actor._delegate.getDragActor) {
-            this._dragActor = this.actor._delegate.getDragActor();
+            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
             this._dragActor.reparent(Main.uiGroup);
             this._dragActor.raise_top();
             Shell.util_set_hidden_from_pick(this._dragActor, true);

js/ui/endSessionDialog.js

@@ -105,7 +105,7 @@ const restartDialogContent = {
     endDescription: _("Restarting the system."),
     confirmButtons: [{ signal: 'ConfirmedReboot',
                        label:  C_("button", "Restart") }],
-    iconName: 'view-refresh-symbolic',
+    iconName: 'system-shutdown-symbolic',
     iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
 

js/ui/extensionSystem.js

@@ -126,10 +126,13 @@ function logExtensionError(uuid, error) {
 
     let message = '' + error;
 
-    extension.state = ExtensionState.ERROR;
+    if (error.state)
+        extension.state = error.state;
+    else
+        extension.state = ExtensionState.ERROR;
+
     if (!extension.errors)
         extension.errors = [];
-    extension.errors.push(message);
 
     log('Extension "%s" had error: %s'.format(uuid, message));
     _signals.emit('extension-state-changed', { uuid: uuid,
@@ -142,16 +145,18 @@ function loadExtension(extension) {
     extension.state = ExtensionState.ERROR;
 
     if (ExtensionUtils.isOutOfDate(extension)) {
-        extension.state = ExtensionState.OUT_OF_DATE;
+        let error = new Error('extension is not compatible with current GNOME Shell and/or GJS version');
+        error.state = ExtensionState.OUT_OF_DATE;
+        throw error;
+    }
+
+    let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
+    if (enabled) {
+        initExtension(extension.uuid);
+        if (extension.state == ExtensionState.DISABLED)
+            enableExtension(extension.uuid);
     } else {
-        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
-        if (enabled) {
-            initExtension(extension.uuid);
-            if (extension.state == ExtensionState.DISABLED)
-                enableExtension(extension.uuid);
-        } else {
-            extension.state = ExtensionState.INITIALIZED;
-        }
+        extension.state = ExtensionState.INITIALIZED;
     }
 
     _signals.emit('extension-state-changed', extension);
@@ -212,16 +217,8 @@ function initExtension(uuid) {
     _signals.emit('extension-loaded', uuid);
 }
 
-function getEnabledExtensions() {
-    let extensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-    if (!Array.isArray(Main.sessionMode.enabledExtensions))
-        return extensions;
-
-    return Main.sessionMode.enabledExtensions.concat(extensions);
-}
-
 function onEnabledExtensionsChanged() {
-    let newEnabledExtensions = getEnabledExtensions();
+    let newEnabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
 
     if (!enabled)
         return;
@@ -255,7 +252,7 @@ function onEnabledExtensionsChanged() {
 
 function _loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
-    enabledExtensions = getEnabledExtensions();
+    enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
 
     let finder = new ExtensionUtils.ExtensionFinder();
     finder.connect('extension-found', function(signals, extension) {
@@ -297,17 +294,10 @@ function disableAllExtensions() {
 }
 
 function _sessionUpdated() {
-    // For now sessionMode.allowExtensions controls extensions from both the
-    // 'enabled-extensions' preference and the sessionMode.enabledExtensions
-    // property; it might make sense to make enabledExtensions independent
-    // from allowExtensions in the future
-    if (Main.sessionMode.allowExtensions) {
-        if (initted)
-            onEnabledExtensionsChanged();
+    if (Main.sessionMode.allowExtensions)
         enableAllExtensions();
-    } else {
+    else
         disableAllExtensions();
-    }
 }
 
 function init() {

js/ui/flashspot.js

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

js/ui/grabHelper.js

@@ -23,7 +23,6 @@ function _navigateActor(actor) {
 
 // GrabHelper:
 // @owner: the actor that owns the GrabHelper
-// @params: optional parameters to pass to Main.pushModal()
 //
 // Creates a new GrabHelper object, for dealing with keyboard and pointer grabs
 // associated with a set of actors.
@@ -35,14 +34,14 @@ function _navigateActor(actor) {
 const GrabHelper = new Lang.Class({
     Name: 'GrabHelper',
 
-    _init: function(owner, params) {
+    _init: function(owner) {
         this._owner = owner;
-        this._modalParams = params;
 
         this._grabStack = [];
 
         this._actors = [];
         this._capturedEventId = 0;
+        this._eventId = 0;
         this._keyFocusNotifyId = 0;
         this._focusWindowChangedId = 0;
         this._ignoreRelease = false;
@@ -77,12 +76,9 @@ const GrabHelper = new Lang.Class({
     },
 
     _isWithinGrabbedActor: function(actor) {
-       let currentActor = this.currentGrab.actor;
         while (actor) {
             if (this._actors.indexOf(actor) != -1)
                 return true;
-            if (actor == currentActor)
-                return true;
             actor = actor.get_parent();
         }
         return false;
@@ -92,14 +88,6 @@ const GrabHelper = new Lang.Class({
         return this._grabStack[this._grabStack.length - 1] || {};
     },
 
-    get grabbed() {
-        return this._grabStack.length > 0;
-    },
-
-    get grabStack() {
-        return this._grabStack;
-    },
-
     _findStackIndex: function(actor) {
         if (!actor)
             return -1;
@@ -111,16 +99,6 @@ const GrabHelper = new Lang.Class({
         return -1;
     },
 
-    _actorInGrabStack: function(actor) {
-        while (actor) {
-            let idx = this._findStackIndex(actor);
-            if (idx >= 0)
-                return idx;
-            actor = actor.get_parent();
-        }
-        return -1;
-    },
-
     isActorGrabbed: function(actor) {
         return this._findStackIndex(actor) >= 0;
     },
@@ -160,7 +138,6 @@ const GrabHelper = new Lang.Class({
         params = Params.parse(params, { actor: null,
                                         modal: false,
                                         grabFocus: false,
-                                        focus: null,
                                         onUngrab: null });
 
         let focus = global.stage.key_focus;
@@ -178,14 +155,9 @@ const GrabHelper = new Lang.Class({
         if (params.grabFocus && !this._takeFocusGrab(hadFocus))
             return false;
 
-        if (params.focus)
-            params.focus.grab_key_focus();
-        else if (hadFocus || params.grabFocus)
+        if (hadFocus || params.grabFocus)
             _navigateActor(newFocus);
 
-        if ((params.grabFocus || params.modal) && !this._capturedEventId)
-            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-
         this._grabStack.push(params);
         return true;
     },
@@ -193,8 +165,11 @@ const GrabHelper = new Lang.Class({
     _takeModalGrab: function() {
         let firstGrab = (this._modalCount == 0);
         if (firstGrab) {
-            if (!Main.pushModal(this._owner, this._modalParams))
+            if (!Main.pushModal(this._owner))
                 return false;
+
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+            this._eventId = global.stage.connect('event', Lang.bind(this, this._onEvent));
         }
 
         this._modalCount++;
@@ -206,6 +181,16 @@ const GrabHelper = new Lang.Class({
         if (this._modalCount > 0)
             return;
 
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+
+        if (this._eventId > 0) {
+            global.stage.disconnect(this._eventId);
+            this._eventId = 0;
+        }
+
         Main.popModal(this._owner);
         global.sync_pointer();
     },
@@ -217,6 +202,7 @@ const GrabHelper = new Lang.Class({
 
             this._grabbedFromKeynav = hadFocus;
             this._preGrabInputMode = global.stage_input_mode;
+            this._prevFocusedWindow = metaDisplay.focus_window;
 
             if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
                 this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
@@ -255,7 +241,13 @@ const GrabHelper = new Lang.Class({
                 global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
         }
 
-        global.screen.focus_default_window(global.get_current_time());
+        if (this._prevFocusedWindow) {
+            let metaDisplay = global.screen.get_display();
+            if (!metaDisplay.focus_window) {
+                metaDisplay.set_input_focus_window(this._prevFocusedWindow,
+                                                   false, global.get_current_time());
+            }
+        }
     },
 
     // ignoreRelease:
@@ -276,8 +268,7 @@ const GrabHelper = new Lang.Class({
     // If the actor that was popped from the grab stack was not the actor
     // That was passed in, this call is ignored.
     ungrab: function(params) {
-        params = Params.parse(params, { actor: this.currentGrab.actor,
-                                        isUser: false });
+        params = Params.parse(params, { actor: this.currentGrab.actor });
 
         let grabStackIndex = this._findStackIndex(params.actor);
         if (grabStackIndex < 0)
@@ -295,7 +286,7 @@ const GrabHelper = new Lang.Class({
             let poppedGrab = poppedGrabs[i];
 
             if (poppedGrab.onUngrab)
-                poppedGrab.onUngrab(params.isUser);
+                poppedGrab.onUngrab();
 
             if (poppedGrab.modal)
                 this._releaseModalGrab();
@@ -304,11 +295,6 @@ const GrabHelper = new Lang.Class({
                 this._releaseFocusGrab();
         }
 
-        if (!this.grabbed && this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-
         if (hadFocus) {
             let poppedGrab = poppedGrabs[0];
             _navigateActor(poppedGrab.savedFocus);
@@ -317,20 +303,13 @@ const GrabHelper = new Lang.Class({
 
     _onCapturedEvent: function(actor, event) {
         let type = event.type();
-
-        if (type == Clutter.EventType.KEY_PRESS &&
-            event.get_key_symbol() == Clutter.KEY_Escape) {
-            this.ungrab({ isUser: true });
-            return true;
-        }
-
         let press = type == Clutter.EventType.BUTTON_PRESS;
         let release = type == Clutter.EventType.BUTTON_RELEASE;
         let button = press || release;
 
         if (release && this._ignoreRelease) {
             this._ignoreRelease = false;
-            return true;
+            return false;
         }
 
         if (!button && this._modalCount == 0)
@@ -347,22 +326,33 @@ const GrabHelper = new Lang.Class({
             // which should be a release event.
             if (press)
                 this._ignoreRelease = true;
-            let i = this._actorInGrabStack(event.get_source()) + 1;
-            this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
+            this.ungrab({ actor: this._grabStack[0].actor });
         }
 
         return this._modalCount > 0;
     },
 
+    // We catch 'event' rather than 'key-press-event' so that we get
+    // a chance to run before the overview's own Escape check
+    _onEvent: function(actor, event) {
+        if (event.type() == Clutter.EventType.KEY_PRESS &&
+            event.get_key_symbol() == Clutter.KEY_Escape) {
+            this.ungrab();
+            return true;
+        }
+
+        return false;
+    },
+
     _onKeyFocusChanged: function() {
         let focus = global.stage.key_focus;
         if (!focus || !this._isWithinGrabbedActor(focus))
-            this.ungrab({ isUser: true });
+            this.ungrab();
     },
 
     _focusWindowChanged: function() {
         let metaDisplay = global.screen.get_display();
         if (metaDisplay.focus_window != null)
-            this.ungrab({ isUser: true });
+            this.ungrab();
     }
 });

js/ui/iconGrid.js

@@ -23,8 +23,6 @@ const BaseIcon = new Lang.Class({
         this.actor._delegate = this;
         this.actor.connect('style-changed',
                            Lang.bind(this, this._onStyleChanged));
-        this.actor.connect('destroy',
-                           Lang.bind(this, this._onDestroy));
 
         this._spacing = 0;
 
@@ -54,9 +52,6 @@ const BaseIcon = new Lang.Class({
         this._setSizeManually = params.setSizeManually;
 
         this.icon = null;
-
-        let cache = St.TextureCache.get_default();
-        this._iconThemeChangedId = cache.connect('icon-theme-changed', Lang.bind(this, this._onIconThemeChanged));
     },
 
     _allocate: function(actor, box, flags) {
@@ -151,22 +146,7 @@ const BaseIcon = new Lang.Class({
             size = found ? len : ICON_SIZE;
         }
 
-        if (this.iconSize == size && this._iconBin.child)
-            return;
-
         this._createIconTexture(size);
-    },
-
-    _onDestroy: function() {
-        if (this._iconThemeChangedId > 0) {
-            let cache = St.TextureCache.get_default();
-            cache.disconnect(this._iconThemeChangedId);
-            this._iconThemeChangedId = 0;
-        }
-    },
-
-    _onIconThemeChanged: function() {
-        this._createIconTexture(this.iconSize);
     }
 });
 
@@ -218,11 +198,7 @@ const IconGrid = new Lang.Class({
 
     _getPreferredHeight: function (grid, forWidth, alloc) {
         let children = this._getVisibleChildren();
-        let nColumns;
-        if (forWidth < 0)
-            nColumns = children.length;
-        else
-            nColumns = this._computeLayout(forWidth)[0];
+        let [nColumns, usedWidth] = this._computeLayout(forWidth);
         let nRows;
         if (nColumns > 0)
             nRows = Math.ceil(children.length / nColumns);

js/ui/keyboard.js

@@ -2,27 +2,43 @@
 
 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;
+const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
-const Layout = imports.ui.layout;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 
-const KEYBOARD_REST_TIME = Layout.KEYBOARD_ANIMATION_TIME * 2 * 1000;
-
 const KEYBOARD_SCHEMA = 'org.gnome.shell.keyboard';
 const KEYBOARD_TYPE = 'keyboard-type';
 
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
+// Key constants taken from Antler
+// FIXME: ought to be moved into libcaribou
+const PRETTY_KEYS = {
+    'BackSpace': '\u232b',
+    'space': ' ',
+    'Return': '\u23ce',
+    'Caribou_Prefs': '\u2328',
+    'Caribou_ShiftUp': '\u2b06',
+    'Caribou_ShiftDown': '\u2b07',
+    'Caribou_Emoticons': '\u263a',
+    'Caribou_Symbols': '123',
+    'Caribou_Symbols_More': '{#*',
+    'Caribou_Alpha': 'Abc',
+    'Tab': 'Tab',
+    'Escape': 'Esc',
+    'Control_L': 'Ctrl',
+    'Alt_L': 'Alt'
+};
+
 const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
 <method name='Show'>
     <arg type='u' direction='in' />
@@ -59,7 +75,14 @@ const Key = new Lang.Class({
         if (this._key.name == 'Control_L' || this._key.name == 'Alt_L')
             this._key.latch = true;
 
+        this._key.connect('key-pressed', Lang.bind(this, function ()
+                                                   { this.actor.checked = true }));
+        this._key.connect('key-released', Lang.bind(this, function ()
+                                                    { this.actor.checked = false; }));
+
         if (this._extended_keys.length > 0) {
+            this._grabbed = false;
+            this._eventCaptureId = 0;
             this._key.connect('notify::show-subkeys', Lang.bind(this, this._onShowSubkeysChanged));
             this._boxPointer = new BoxPointer.BoxPointer(St.Side.BOTTOM,
                                                          { x_fill: true,
@@ -75,7 +98,17 @@ const Key = new Lang.Class({
     },
 
     _makeKey: function () {
-        let label = GLib.markup_escape_text(this._key.label, -1);
+        let label = this._key.name;
+
+        if (label.length > 1) {
+            let pretty = PRETTY_KEYS[label];
+            if (pretty)
+                label = pretty;
+            else
+                label = this._getUnichar(this._key);
+        }
+
+        label = GLib.markup_escape_text(label, -1);
         let button = new St.Button ({ label: label,
                                       style_class: 'keyboard-key' });
 
@@ -111,23 +144,52 @@ const Key = new Lang.Class({
         this._boxPointer.bin.add_actor(this._extended_keyboard);
     },
 
-    get subkeys() {
-        return this._boxPointer;
+    _onEventCapture: function (actor, event) {
+        let source = event.get_source();
+        let type = event.type();
+
+        if ((type == Clutter.EventType.BUTTON_PRESS ||
+             type == Clutter.EventType.BUTTON_RELEASE) &&
+            this._extended_keyboard.contains(source)) {
+            source.extended_key.press();
+            source.extended_key.release();
+            return false;
+        }
+        if (type == Clutter.EventType.BUTTON_PRESS) {
+            this._boxPointer.actor.hide();
+            this._ungrab();
+            return true;
+        }
+        return false;
+    },
+
+    _ungrab: function () {
+        global.stage.disconnect(this._eventCaptureId);
+        this._eventCaptureId = 0;
+        this._grabbed = false;
+        Main.popModal(this.actor);
     },
 
     _onShowSubkeysChanged: function () {
         if (this._key.show_subkeys) {
+            this.actor.fake_release();
             this._boxPointer.actor.raise_top();
             this._boxPointer.setPosition(this.actor, 0.5);
-            this.emit('show-subkeys');
-            this.actor.fake_release();
+            this._boxPointer.show(BoxPointer.PopupAnimation.FULL);
             this.actor.set_hover(false);
+            if (!this._grabbed) {
+                 Main.pushModal(this.actor);
+                 this._eventCaptureId = global.stage.connect('captured-event', Lang.bind(this, this._onEventCapture));
+                 this._grabbed = true;
+            }
+            this._key.release();
         } else {
-            this.emit('hide-subkeys');
+            if (this._grabbed)
+                this._ungrab();
+            this._boxPointer.hide(BoxPointer.PopupAnimation.FULL);
         }
     }
 });
-Signals.addSignalMethods(Key.prototype);
 
 const Keyboard = new Lang.Class({
     // HACK: we can't set Name, because it collides with Name dbus property
@@ -149,18 +211,6 @@ const Keyboard = new Lang.Class({
         this._a11yApplicationsSettings = new Gio.Settings({ schema: A11Y_APPLICATIONS_SCHEMA });
         this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._settingsChanged));
         this._settingsChanged();
-
-        this._showIdleId = 0;
-        this._subkeysBoxPointer = null;
-        this._capturedEventId = 0;
-        this._capturedPress = false;
-
-        this._keyboardVisible = false;
-        Main.layoutManager.connect('keyboard-visible-changed', Lang.bind(this, function(o, visible) {
-            this._keyboardVisible = visible;
-        }));
-        this._keyboardRequested = false;
-        this._keyboardRestingId = 0;
     },
 
     init: function () {
@@ -230,7 +280,7 @@ const Keyboard = new Lang.Class({
         this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
 
         if (show)
-            this.show(Main.layoutManager.focusIndex);
+            this.show();
         else
             this._createSource();
     },
@@ -252,14 +302,10 @@ const Keyboard = new Lang.Class({
             return;
 
         let time = global.get_current_time();
-        if (!(focus instanceof Clutter.Text)) {
+        if (focus instanceof Clutter.Text)
+            this.Show(time);
+        else
             this.Hide(time);
-            return;
-        }
-
-        if (!this._showIdleId)
-            this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE,
-                                             Lang.bind(this, function() { this.Show(time); }));
     },
 
     _addKeys: function () {
@@ -314,19 +360,6 @@ const Keyboard = new Lang.Class({
         return trayButton;
     },
 
-    _onCapturedEvent: function(actor, event) {
-        let type = event.type();
-        let press = type == Clutter.EventType.BUTTON_PRESS;
-        let release = type == Clutter.EventType.BUTTON_RELEASE;
-
-        if (press)
-            this._capturedPress = true;
-        else if (release && this._capturedPress)
-            this._hideSubkeys();
-
-        return true;
-    },
-
     _addRows : function (keys, layout) {
         let keyboard_row = new St.BoxLayout();
         for (let i = 0; i < keys.length; ++i) {
@@ -349,19 +382,6 @@ const Keyboard = new Lang.Class({
                     // Add new key for hiding message tray
                     right_box.add(this._getTrayIcon());
                 }
-
-                button.connect('show-subkeys', Lang.bind(this, function() {
-                    if (this._subkeysBoxPointer)
-                        this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
-                    this._subkeysBoxPointer = button.subkeys;
-                    this._subkeysBoxPointer.show(BoxPointer.PopupAnimation.FULL);
-                    if (!this._capturedEventId)
-                        this._capturedEventId = this.actor.connect('captured-event',
-                                                                   Lang.bind(this, this._onCapturedEvent));
-                }));
-                button.connect('hide-subkeys', Lang.bind(this, function() {
-                    this._hideSubkeys();
-                }));
             }
             keyboard_row.add(left_box, { expand: true, x_fill: false, x_align: St.Align.START });
             keyboard_row.add(right_box, { expand: true, x_fill: false, x_align: St.Align.END });
@@ -384,7 +404,7 @@ const Keyboard = new Lang.Class({
         if (!this._enableKeyboard)
             return;
 
-        let monitor = Main.layoutManager.keyboardMonitor;
+        let monitor = Main.layoutManager.bottomMonitor;
         let maxHeight = monitor.height / 3;
         this.actor.width = monitor.width;
 
@@ -471,79 +491,18 @@ const Keyboard = new Lang.Class({
                actor._extended_keys || actor.extended_key;
     },
 
-    _clearKeyboardRestTimer: function() {
-        if (!this._keyboardRestingId)
-            return;
-        GLib.source_remove(this._keyboardRestingId);
-        this._keyboardRestingId = 0;
-    },
-
-    show: function (monitor) {
-        this._keyboardRequested = true;
-
-        if (this._keyboardVisible) {
-            if (monitor != Main.layoutManager.keyboardIndex) {
-                Main.layoutManager.keyboardIndex = monitor;
-                this._redraw();
-            }
-            return;
-        }
-
-        this._clearKeyboardRestTimer();
-        this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                   KEYBOARD_REST_TIME,
-                                                   Lang.bind(this, function() {
-                                                       this._clearKeyboardRestTimer();
-                                                       this._show(monitor);
-                                                   }));
-    },
-
-    _show: function(monitor) {
-        if (!this._keyboardRequested)
-            return;
-
-        Main.layoutManager.keyboardIndex = monitor;
+    show: function () {
         this._redraw();
+
         Main.layoutManager.showKeyboard();
         this._destroySource();
     },
 
     hide: function () {
-        this._keyboardRequested = false;
-
-        if (!this._keyboardVisible)
-            return;
-
-        this._clearKeyboardRestTimer();
-        this._keyboardRestingId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                   KEYBOARD_REST_TIME,
-                                                   Lang.bind(this, function() {
-                                                       this._clearKeyboardRestTimer();
-                                                       this._hide();
-                                                   }));
-    },
-
-    _hide: function() {
-        if (this._keyboardRequested)
-            return;
-
-        this._hideSubkeys();
         Main.layoutManager.hideKeyboard();
         this._createSource();
     },
 
-    _hideSubkeys: function() {
-        if (this._subkeysBoxPointer) {
-            this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
-            this._subkeysBoxPointer = null;
-        }
-        if (this._capturedEventId) {
-            this.actor.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-        this._capturedPress = false;
-    },
-
     _moveTemporarily: function () {
         let currentWindow = global.screen.get_display().focus_window;
         let rect = currentWindow.get_outer_rect();
@@ -572,13 +531,6 @@ const Keyboard = new Lang.Class({
         return one - two;
     },
 
-    _clearShowIdle: function() {
-        if (!this._showIdleId)
-            return;
-        GLib.source_remove(this._showIdleId);
-        this._showIdleId = 0;
-    },
-
     // D-Bus methods
     Show: function(timestamp) {
         if (!this._enableKeyboard)
@@ -587,11 +539,9 @@ const Keyboard = new Lang.Class({
         if (this._compareTimestamp(timestamp, this._timestamp) < 0)
             return;
 
-        this._clearShowIdle();
-
         if (timestamp != Clutter.CURRENT_TIME)
             this._timestamp = timestamp;
-        this.show(Main.layoutManager.focusIndex);
+        this.show();
     },
 
     Hide: function(timestamp) {
@@ -601,8 +551,6 @@ const Keyboard = new Lang.Class({
         if (this._compareTimestamp(timestamp, this._timestamp) < 0)
             return;
 
-        this._clearShowIdle();
-
         if (timestamp != Clutter.CURRENT_TIME)
             this._timestamp = timestamp;
         this.hide();
@@ -647,7 +595,6 @@ const KeyboardSource = new Lang.Class({
     },
 
     open: function() {
-        // Show the OSK below the message tray
-        this._keyboard.show(Main.layoutManager.bottomIndex);
+        this._keyboard.show();
     }
 });

js/ui/layout.js

@@ -16,7 +16,7 @@ const Tweener = imports.ui.tweener;
 
 const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;
 const STARTUP_ANIMATION_TIME = 0.2;
-const KEYBOARD_ANIMATION_TIME = 0.15;
+const KEYBOARD_ANIMATION_TIME = 0.5;
 const PLYMOUTH_TRANSITION_TIME = 1;
 
 const MonitorConstraint = new Lang.Class({
@@ -103,9 +103,8 @@ const LayoutManager = new Lang.Class({
         this.monitors = [];
         this.primaryMonitor = null;
         this.primaryIndex = -1;
-        this._keyboardIndex = -1;
         this._hotCorners = [];
-        this._background = null;
+        this._rootPixmap = null;
         this._leftPanelBarrier = 0;
         this._rightPanelBarrier = 0;
         this._trayBarrier = 0;
@@ -124,11 +123,13 @@ const LayoutManager = new Lang.Class({
         this.addChrome(this.panelBox, { affectsStruts: true,
                                         trackFullscreen: true });
         this.panelBox.connect('allocation-changed',
-                              Lang.bind(this, this._panelBoxChanged));
+                              Lang.bind(this, this._updatePanelBarriers));
 
         this.trayBox = new St.Widget({ name: 'trayBox',
                                        layout_manager: new Clutter.BinLayout() }); 
         this.addChrome(this.trayBox);
+        this.trayBox.connect('allocation-changed',
+                             Lang.bind(this, this._updateTrayBarrier));
 
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
@@ -241,8 +242,9 @@ const LayoutManager = new Lang.Class({
         this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
-        if (this.keyboardIndex < 0)
-            this.keyboardIndex = this.primaryIndex;
+        this.keyboardBox.set_position(this.bottomMonitor.x,
+                                      this.bottomMonitor.y + this.bottomMonitor.height);
+        this.keyboardBox.set_size(this.bottomMonitor.width, -1);
 
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);
@@ -256,11 +258,6 @@ const LayoutManager = new Lang.Class({
                               this.bottomMonitor.width, this.bottomMonitor.height);
     },
 
-    _panelBoxChanged: function() {
-        this.emit('panel-box-changed');
-        this._updatePanelBarriers();
-    },
-
     _updatePanelBarriers: function() {
         if (this._leftPanelBarrier)
             global.destroy_pointer_barrier(this._leftPanelBarrier);
@@ -283,6 +280,22 @@ const LayoutManager = new Lang.Class({
         }
     },
 
+    _updateTrayBarrier: function() {
+        let monitor = this.bottomMonitor;
+
+        if (this._trayBarrier)
+            global.destroy_pointer_barrier(this._trayBarrier);
+
+        if (Main.messageTray) {
+            this._trayBarrier =
+                global.create_pointer_barrier(monitor.x + monitor.width, monitor.y + monitor.height - Main.messageTray.actor.height,
+                                              monitor.x + monitor.width, monitor.y + monitor.height,
+                                              4 /* BarrierNegativeX */);
+        } else {
+            this._trayBarrier = 0;
+        }
+    },
+
     _monitorsChanged: function() {
         this._updateMonitors();
         this._updateBoxes();
@@ -310,44 +323,8 @@ const LayoutManager = new Lang.Class({
         return this.monitors[index];
     },
 
-    get keyboardMonitor() {
-        return this.monitors[this.keyboardIndex];
-    },
-
-    get focusIndex() {
-        let i = Main.layoutManager.primaryIndex;
-
-        if (global.stage_input_mode == Shell.StageInputMode.FOCUSED ||
-            global.stage_input_mode == Shell.StageInputMode.FULLSCREEN) {
-            let focusActor = global.stage.key_focus;
-            if (focusActor)
-                i = this._chrome.findIndexForActor(focusActor);
-        } else {
-            let focusWindow = global.display.focus_window;
-            if (focusWindow)
-                i = this._chrome.findIndexForWindow(focusWindow);
-        }
-
-        return i;
-    },
-
-    get focusMonitor() {
-        return this.monitors[this.focusIndex];
-    },
-
-    set keyboardIndex(v) {
-        this._keyboardIndex = v;
-        this.keyboardBox.set_position(this.keyboardMonitor.x,
-                                      this.keyboardMonitor.y + this.keyboardMonitor.height);
-        this.keyboardBox.set_size(this.keyboardMonitor.width, -1);
-    },
-
-    get keyboardIndex() {
-        return this._keyboardIndex;
-    },
-
     _startupAnimation: function() {
-        this.panelBox.translation_y = -this.panelBox.height;
+        this.panelBox.anchor_y = this.panelBox.height;
 
         let plymouthTransitionRunning = false;
 
@@ -356,34 +333,34 @@ const LayoutManager = new Lang.Class({
         // to the greeter. Otherwise, we'll just animate the panel,
         // as usual.
         if (Main.sessionMode.isGreeter) {
-            this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-            if (this._background != null) {
-                Main.uiGroup.add_actor(this._background);
-                Tweener.addTween(this._background,
+            this._rootPixmap = global.create_xrootpmap_texture();
+            if (this._rootPixmap != null) {
+                Main.uiGroup.add_actor(this._rootPixmap);
+                Tweener.addTween(this._rootPixmap,
                                  { opacity: 0,
                                    time: PLYMOUTH_TRANSITION_TIME,
                                    transition: 'linear',
-                                   onComplete: this._fadeBackgroundComplete,
+                                   onComplete: this._fadeRootpmapComplete,
                                    onCompleteScope: this });
                 plymouthTransitionRunning = true;
             }
         }
 
         if (!plymouthTransitionRunning)
-            this._fadeBackgroundComplete();
+            this._fadeRootpmapComplete();
     },
 
-    _fadeBackgroundComplete: function() {
+    _fadeRootpmapComplete: function() {
         // Don't animate the strut
         this._chrome.freezeUpdateRegions();
 
-        if (this._background != null) {
-            this._background.destroy();
-            this._background = null;
+        if (this._rootPixmap != null) {
+            this._rootPixmap.destroy();
+            this._rootPixmap = null;
         }
 
         Tweener.addTween(this.panelBox,
-                         { translation_y: 0,
+                         { anchor_y: 0,
                            time: STARTUP_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: this._startupAnimationComplete,
@@ -392,7 +369,6 @@ const LayoutManager = new Lang.Class({
     },
 
     _startupAnimationComplete: function() {
-        this.emit('panel-box-changed');
         this._chrome.thawUpdateRegions();
     },
 
@@ -405,14 +381,11 @@ const LayoutManager = new Lang.Class({
                            onComplete: this._showKeyboardComplete,
                            onCompleteScope: this
                          });
-
-        if (this.keyboardIndex == this.bottomIndex) {
-            Tweener.addTween(this.trayBox,
-                             { anchor_y: this.keyboardBox.height,
-                               time: KEYBOARD_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
+        Tweener.addTween(this.trayBox,
+                         { anchor_y: this.keyboardBox.height,
+                           time: KEYBOARD_ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });
 
         this.emit('keyboard-visible-changed', true);
     },
@@ -424,8 +397,7 @@ const LayoutManager = new Lang.Class({
 
         this._keyboardHeightNotifyId = this.keyboardBox.connect('notify::height', Lang.bind(this, function () {
             this.keyboardBox.anchor_y = this.keyboardBox.height;
-            if (this.keyboardIndex == this.bottomIndex)
-                this.trayBox.anchor_y = this.keyboardBox.height;
+            this.trayBox.anchor_y = this.keyboardBox.height;
         }));
     },
 
@@ -437,18 +409,15 @@ const LayoutManager = new Lang.Class({
         Tweener.addTween(this.keyboardBox,
                          { anchor_y: 0,
                            time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
-                           transition: 'easeInQuad',
+                           transition: 'easeOutQuad',
                            onComplete: this._hideKeyboardComplete,
                            onCompleteScope: this
                          });
-
-        if (this.keyboardIndex == this.bottomIndex) {
-            Tweener.addTween(this.trayBox,
-                             { anchor_y: 0,
-                               time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
+        Tweener.addTween(this.trayBox,
+                         { anchor_y: 0,
+                           time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });
 
         this.emit('keyboard-visible-changed', false);
     },
@@ -512,12 +481,8 @@ const LayoutManager = new Lang.Class({
     },
 
     findMonitorForActor: function(actor) {
-        return this.monitors[this._chrome.findIndexForActor(actor)];
-    },
-
-    findMonitorForWindow: function(window) {
-        return this.monitors[this._chrome.findIndexForWindow(window)];
-    },
+        return this._chrome.findMonitorForActor(actor);
+    }
 });
 Signals.addSignalMethods(LayoutManager.prototype);
 
@@ -865,7 +830,6 @@ const Chrome = new Lang.Class({
 
     _relayout: function() {
         this._monitors = this._layoutManager.monitors;
-        this._primaryIndex = this._layoutManager.primaryIndex;
         this._primaryMonitor = this._layoutManager.primaryMonitor;
 
         this._updateFullscreen();
@@ -881,49 +845,32 @@ const Chrome = new Lang.Class({
             let monitor = this._monitors[i];
             if (cx >= monitor.x && cx < monitor.x + monitor.width &&
                 cy >= monitor.y && cy < monitor.y + monitor.height)
-                return i;
+                return monitor;
         }
         // If the center is not on a monitor, return the first overlapping monitor
         for (let i = 0; i < this._monitors.length; i++) {
             let monitor = this._monitors[i];
             if (x + w > monitor.x && x < monitor.x + monitor.width &&
                 y + h > monitor.y && y < monitor.y + monitor.height)
-                return i;
+                return monitor;
         }
         // otherwise on no monitor
-        return -1;
+        return null;
     },
 
-    findIndexForWindow: function(window) {
-        let rect = window.get_input_rect();
-        let i = this._findMonitorForRect(rect.x, rect.y, rect.width, rect.height);
-        if (i >= 0)
-            return i;
-        return this._primaryIndex; // Not on any monitor, pretend its on the primary
+    _findMonitorForWindow: function(window) {
+        return this._findMonitorForRect(window.x, window.y, window.width, window.height);
     },
 
     // This call guarantees that we return some monitor to simplify usage of it
     // In practice all tracked actors should be visible on some monitor anyway
-    findIndexForActor: function(actor) {
+    findMonitorForActor: function(actor) {
         let [x, y] = actor.get_transformed_position();
         let [w, h] = actor.get_transformed_size();
-        let i = this._findMonitorForRect(x, y, w, h);
-        if (i >= 0)
-            return i;
-        return this._primaryIndex; // Not on any monitor, pretend its on the primary
-    },
-
-    findMonitorForWindow: function(window) {
-        let rect = window.get_input_rect();
-        let i = this._findMonitorForRect(rect.x, rect.y, rect.width, rect.height);
-        if (i >= 0)
-            return this._monitors[i];
-        else
-            return null;
-    },
-
-    findMonitorForActor: function(actor) {
-        return this._monitors[this.findIndexForActor(actor)];
+        let monitor = this._findMonitorForRect(x, y, w, h);
+        if (monitor)
+            return monitor;
+        return this._primaryMonitor; // Not on any monitor, pretend its on the primary
     },
 
     _queueUpdateRegions: function() {
@@ -964,15 +911,14 @@ const Chrome = new Lang.Class({
 
         for (let i = windows.length - 1; i > -1; i--) {
             let window = windows[i];
-            let metaWindow = window.meta_window;
-            let layer = metaWindow.get_layer();
+            let layer = window.get_meta_window().get_layer();
 
             // Skip minimized windows
             if (!window.showing_on_its_workspace())
                 continue;
 
             if (layer == Meta.StackLayer.FULLSCREEN) {
-                let monitor = this.findMonitorForWindow(metaWindow);
+                let monitor = this._findMonitorForWindow(window);
                 if (monitor)
                     monitor.inFullscreen = true;
             }
@@ -989,7 +935,7 @@ const Chrome = new Lang.Class({
                 }
 
                 // Or whether it is monitor sized
-                let monitor = this.findMonitorForWindow(metaWindow);
+                let monitor = this._findMonitorForWindow(window);
                 if (monitor &&
                     window.x <= monitor.x &&
                     window.x + window.width >= monitor.x + monitor.width &&
@@ -1092,7 +1038,7 @@ const Chrome = new Lang.Class({
             } else if (y1 <= primary.y && y2 >= primary.y + primary.height) {
                 if (x1 <= 0)
                     side = Meta.Side.LEFT;
-                else if (x2 >= primary.x + primary.width)
+                else if (x2 >= global.screen_width)
                     side = Meta.Side.RIGHT;
                 else
                     continue;

js/ui/lookingGlass.js

@@ -39,7 +39,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                      * in the shell core code too. */
                     'const stage = global.stage; ' +
                     /* Special lookingGlass functions */
-                    'const inspect = Lang.bind(Main.lookingGlass, Main.lookingGlass.inspect); ' +
                     'const it = Main.lookingGlass.getIt(); ' +
                     'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';
 
@@ -872,7 +871,8 @@ const LookingGlass = new Lang.Class({
         inspectIcon.connect('button-press-event', Lang.bind(this, function () {
             let inspector = new Inspector(this);
             inspector.connect('target', Lang.bind(this, function(i, target, stageX, stageY) {
-                this._pushResult('inspect(' + Math.round(stageX) + ', ' + Math.round(stageY) + ')', target);
+                this._pushResult('<inspect x:' + stageX + ' y:' + stageY + '>',
+                                 target);
             }));
             inspector.connect('closed', Lang.bind(this, function() {
                 this.actor.show();
@@ -1057,10 +1057,6 @@ const LookingGlass = new Lang.Class({
         this._entry.text = '';
     },
 
-    inspect: function(x, y) {
-        return global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-    },
-
     getIt: function () {
         return this._it;
     },
@@ -1133,7 +1129,7 @@ const LookingGlass = new Lang.Class({
         if (this._open)
             return;
 
-        if (!Main.pushModal(this._entry, { keybindingMode: Main.KeybindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry))
             return;
 
         this._notebook.selectIndex(0);

js/ui/main.js

@@ -20,7 +20,6 @@ const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
-const Params = imports.misc.params;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
 const LookingGlass = imports.ui.lookingGlass;
@@ -40,19 +39,6 @@ const Util = imports.misc.util;
 const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
 const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
-const KeybindingMode = {
-    NONE:          0,       // block all keybindings
-    NORMAL:        1 << 0,  // window mode
-    OVERVIEW:      1 << 1,
-    LOCK_SCREEN:   1 << 2,
-    UNLOCK_SCREEN: 1 << 3,
-    LOGIN_SCREEN:  1 << 4,
-    MESSAGE_TRAY:  1 << 5,
-    SYSTEM_MODAL:  1 << 6,
-    LOOKING_GLASS: 1 << 7,
-    ALL:           ~0,
-};
-
 let componentManager = null;
 let panel = null;
 let overview = null;
@@ -69,7 +55,6 @@ let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = KeybindingMode.NORMAL;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -81,18 +66,10 @@ let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _overridesSettings = null;
 
-function _sessionUpdated() {
-    wm.setCustomKeybindingHandler('panel-main-menu',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
-                                  sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', KeybindingMode.NORMAL |
-                                      KeybindingMode.OVERVIEW);
+let background = null;
 
-    wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
-                                  sessionMode.hasRunDialog ? openRunDialog : null);
+function _sessionUpdated() {
+    Meta.keybindings_set_custom_handler('panel-run-dialog', sessionMode.hasRunDialog ? openRunDialog : null);
     if (sessionMode.isGreeter)
         screenShield.showDialog();
 }
@@ -159,13 +136,13 @@ function start() {
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     overview = new Overview.Overview();
-    wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
     if (UnlockDialog.isSupported())
         screenShield = new ScreenShield.ScreenShield();
     else
         screenShield = new ScreenShield.ScreenShieldFallback();
     panel = new Panel.Panel();
+    wm = new WindowManager.WindowManager();
     messageTray = new MessageTray.MessageTray();
     keyboard = new Keyboard.Keyboard();
     notificationDaemon = new NotificationDaemon.NotificationDaemon();
@@ -178,8 +155,10 @@ function start() {
 
     global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                             false, -1, 1);
+    Meta.keybindings_set_custom_handler('panel-main-menu', Lang.bind(overview, overview.toggle));
     global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
-    sessionMode.connect('updated', _sessionUpdated);
+
+    sessionMode.connect('update', _sessionUpdated);
     _sessionUpdated();
 
     // Provide the bus object for gnome-session to
@@ -188,6 +167,8 @@ function start() {
 
     _startDate = new Date();
 
+    global.stage.connect('captured-event', _globalKeyPressHandler);
+
     log('GNOME Shell started at ' + _startDate);
 
     let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@@ -484,6 +465,80 @@ function getWindowActorsForWorkspace(workspaceIndex) {
     });
 }
 
+// This function encapsulates hacks to make certain global keybindings
+// work even when we are in one of our modes where global keybindings
+// are disabled with a global grab. (When there is a global grab, then
+// all key events will be delivered to the stage, so ::captured-event
+// on the stage can be used for global keybindings.)
+function _globalKeyPressHandler(actor, event) {
+    if (modalCount == 0)
+        return false;
+    if (event.type() != Clutter.EventType.KEY_PRESS)
+        return false;
+
+    if (!sessionMode.allowKeybindingsWhenModal) {
+        if (modalCount > (overview.visible ? 1 : 0))
+            return false;
+    }
+
+    let symbol = event.get_key_symbol();
+    let keyCode = event.get_key_code();
+    let ignoredModifiers = global.display.get_ignored_modifier_mask();
+    let modifierState = event.get_state() & ~ignoredModifiers;
+
+    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
+    let action = global.display.get_keybinding_action(keyCode, modifierState);
+
+    if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
+        ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
+                                modifierState);
+        return true;
+    }
+
+    switch (action) {
+        // left/right would effectively act as synonyms for up/down if we enabled them;
+        // but that could be considered confusing; we also disable them in the main view.
+        //
+        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceLeft();
+        //     return true;
+        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceRight();
+        //     return true;
+        case Meta.KeyBindingAction.WORKSPACE_UP:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            return true;
+        case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            return true;
+        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+        case Meta.KeyBindingAction.COMMAND_2:
+            if (!sessionMode.hasRunDialog)
+                return false;
+
+            openRunDialog();
+            return true;
+        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+        case Meta.KeyBindingAction.OVERLAY_KEY:
+            overview.hide();
+            return true;
+    }
+
+    return false;
+}
+
 function _findModal(actor) {
     for (let i = 0; i < modalActorFocusStack.length; i++) {
         if (modalActorFocusStack[i].actor == actor)
@@ -499,7 +554,7 @@ function isInModalStack(actor) {
 /**
  * pushModal:
  * @actor: #ClutterActor which will be given keyboard focus
- * @params: optional parameters
+ * @timestamp: optional timestamp
  *
  * Ensure we are in a mode where all keyboard and mouse input goes to
  * the stage, and focus @actor. Multiple calls to this function act in
@@ -510,27 +565,21 @@ function isInModalStack(actor) {
  * modal stack returns to this actor, reset the focus to the actor
  * which was focused at the time pushModal() was invoked.
  *
- * @params may be used to provide the following parameters:
- *  - timestamp: used to associate the call with a specific user initiated
- *               event.  If not provided then the value of
- *               global.get_current_time() is assumed.
+ * @timestamp is optionally used to associate the call with a specific user
+ * initiated event.  If not provided then the value of
+ * global.get_current_time() is assumed.
  *
- *  - options: Meta.ModalOptions flags to indicate that the pointer is
- *             already grabbed
- *
- *  - keybindingMode: used to set the current Main.KeybindingMode to filter
- *                    global keybindings; the default of NONE will filter
- *                    out all keybindings
+ * @options: optional Meta.ModalOptions flags to indicate that the
+ *           pointer is alrady grabbed
  *
  * Returns: true iff we successfully acquired a grab or already had one
  */
-function pushModal(actor, params) {
-    params = Params.parse(params, { timestamp: global.get_current_time(),
-                                    options: 0,
-                                    keybindingMode: KeybindingMode.NONE });
+function pushModal(actor, timestamp, options) {
+    if (timestamp == undefined)
+        timestamp = global.get_current_time();
 
     if (modalCount == 0) {
-        if (!global.begin_modal(params.timestamp, params.options)) {
+        if (!global.begin_modal(timestamp, options ? options : 0)) {
             log('pushModal: invocation of begin_modal failed');
             return false;
         }
@@ -545,23 +594,20 @@ function pushModal(actor, params) {
         if (index >= 0)
             popModal(actor);
     });
-
-    let prevFocus = global.stage.get_key_focus();
-    let prevFocusDestroyId;
-    if (prevFocus != null) {
-        prevFocusDestroyId = prevFocus.connect('destroy', function() {
+    let curFocus = global.stage.get_key_focus();
+    let curFocusDestroyId;
+    if (curFocus != null) {
+        curFocusDestroyId = curFocus.connect('destroy', function() {
             let index = _findModal(actor);
             if (index >= 0)
-                modalActorFocusStack[index].prevFocus = null;
+                modalActorFocusStack[index].actor = null;
         });
     }
     modalActorFocusStack.push({ actor: actor,
+                                focus: curFocus,
                                 destroyId: actorDestroyId,
-                                prevFocus: prevFocus,
-                                prevFocusDestroyId: prevFocusDestroyId,
-                                keybindingMode: keybindingMode });
+                                focusDestroyId: curFocusDestroyId });
 
-    keybindingMode = params.keybindingMode;
     global.stage.set_key_focus(actor);
     return true;
 }
@@ -588,7 +634,6 @@ function popModal(actor, timestamp) {
         global.stage.set_key_focus(null);
         global.end_modal(timestamp);
         global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-        keybindingMode = KeybindingMode.NORMAL;
 
         throw new Error('incorrect pop');
     }
@@ -599,34 +644,17 @@ function popModal(actor, timestamp) {
     record.actor.disconnect(record.destroyId);
 
     if (focusIndex == modalActorFocusStack.length - 1) {
-        if (record.prevFocus)
-            record.prevFocus.disconnect(record.prevFocusDestroyId);
-        keybindingMode = record.keybindingMode;
-        global.stage.set_key_focus(record.prevFocus);
+        if (record.focus)
+            record.focus.disconnect(record.focusDestroyId);
+        global.stage.set_key_focus(record.focus);
     } else {
-        // If we have:
-        //     global.stage.set_focus(a);
-        //     Main.pushModal(b);
-        //     Main.pushModal(c);
-        //     Main.pushModal(d);
-        //
-        // then we have the stack:
-        //     [{ prevFocus: a, actor: b },
-        //      { prevFocus: b, actor: c },
-        //      { prevFocus: c, actor: d }]
-        //
-        // When actor c is destroyed/popped, if we only simply remove the
-        // record, then the focus stack will be [a, c], rather than the correct
-        // [a, b]. Shift the focus stack up before removing the record to ensure
-        // that we get the correct result.
         let t = modalActorFocusStack[modalActorFocusStack.length - 1];
-        if (t.prevFocus)
-            t.prevFocus.disconnect(t.prevFocusDestroyId);
+        if (t.focus)
+            t.focus.disconnect(t.focusDestroyId);
         // Remove from the middle, shift the focus chain up
         for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
-            modalActorFocusStack[i].prevFocus = modalActorFocusStack[i - 1].prevFocus;
-            modalActorFocusStack[i].prevFocusDestroyId = modalActorFocusStack[i - 1].prevFocusDestroyId;
-            modalActorFocusStack[i].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
+            modalActorFocusStack[i].focus = modalActorFocusStack[i - 1].focus;
+            modalActorFocusStack[i].focusDestroyId = modalActorFocusStack[i - 1].focusDestroyId;
         }
     }
     modalActorFocusStack.splice(focusIndex, 1);
@@ -637,7 +665,6 @@ function popModal(actor, timestamp) {
     global.end_modal(timestamp);
     global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
     Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = KeybindingMode.NORMAL;
 }
 
 function createLookingGlass() {

js/ui/messageTray.js

@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Atk = imports.gi.Atk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@@ -36,6 +35,8 @@ const LONGER_SUMMARY_TIMEOUT = 4;
 const HIDE_TIMEOUT = 0.2;
 const LONGER_HIDE_TIMEOUT = 0.6;
 
+const NOTIFICATION_ICON_SIZE = 24;
+
 // We delay hiding of the tray if the mouse is within MOUSE_LEFT_ACTOR_THRESHOLD
 // range from the point where it left the tray.
 const MOUSE_LEFT_ACTOR_THRESHOLD = 20;
@@ -142,9 +143,14 @@ const URLHighlighter = new Lang.Class({
                 let url = this._urls[urlId].url;
                 if (url.indexOf(':') == -1)
                     url = 'http://' + url;
-
-                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-                return true;
+                try {
+                    Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
+                    return true;
+                } catch (e) {
+                    // TODO: remove this after gnome 3 release
+                    Util.spawn(['gvfs-open', url]);
+                    return true;
+                }
             }
             return false;
         }));
@@ -236,8 +242,13 @@ function makeCloseButton() {
 
     closeButton.connect('style-changed', function() {
         let themeNode = closeButton.get_theme_node();
-        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
-        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
+
+        // libcroco doesn't support negative units
+        let direction = closeButton.get_text_direction() == Clutter.TextDirection.RTL ? -1 : 1;
+        closeButton.translation_x = direction * themeNode.get_length('-shell-close-overlap-x');
+
+        // libcroco doesn't support negative units
+        closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
     });
 
     return closeButton;
@@ -283,12 +294,9 @@ function makeCloseButton() {
 // If @params contains a 'body' parameter, then that text will be added to
 // the content area (as with addBody()).
 //
-// By default, the icon shown is the same as the source's.
-// However, if @params contains a 'gicon' parameter, the passed in gicon
-// will be used.
-//
-// You can add a secondary icon to the banner with 'secondaryGIcon'. There
-// is no fallback for this icon.
+// By default, the icon shown is created by calling
+// source.createIcon(). However, if @params contains an 'icon'
+// parameter, the passed in icon will be used.
 //
 // If @params contains a 'titleMarkup', 'bannerMarkup', or
 // 'bodyMarkup' parameter with the value %true, then the corresponding
@@ -303,8 +311,6 @@ function makeCloseButton() {
 const Notification = new Lang.Class({
     Name: 'Notification',
 
-    ICON_SIZE: 24,
-
     IMAGE_SIZE: 125,
 
     _init: function(source, title, banner, params) {
@@ -314,7 +320,6 @@ const Notification = new Lang.Class({
         this.resident = false;
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
-        this.forFeedback = false;
         this.expanded = false;
         this.focused = false;
         this.acknowledged = false;
@@ -389,8 +394,8 @@ const Notification = new Lang.Class({
     update: function(title, banner, params) {
         params = Params.parse(params, { customContent: false,
                                         body: null,
-                                        gicon: null,
-                                        secondaryGIcon: null,
+                                        icon: null,
+                                        secondaryIcon: null,
                                         titleMarkup: false,
                                         bannerMarkup: false,
                                         bodyMarkup: false,
@@ -400,12 +405,12 @@ const Notification = new Lang.Class({
 
         let oldFocus = global.stage.key_focus;
 
-        if (this._icon && (params.gicon || params.clear)) {
+        if (this._icon && (params.icon || params.clear)) {
             this._icon.destroy();
             this._icon = null;
         }
 
-        if (this._secondaryIcon && (params.secondaryGIcon || params.clear)) {
+        if (this._secondaryIcon && (params.secondaryIcon || params.clear)) {
             this._secondaryIcon.destroy();
             this._secondaryIcon = null;
         }
@@ -435,14 +440,8 @@ const Notification = new Lang.Class({
         if (!this._scrollArea && !this._actionArea && !this._imageBin)
             this._table.remove_style_class_name('multi-line-notification');
 
-        if (params.gicon) {
-            this._icon = new St.Icon({ gicon: params.gicon,
-                                       icon_size: this.ICON_SIZE });
-        } else {
-            this._icon = this.source.createIcon(this.ICON_SIZE);
-        }
-
-        if (this._icon) {
+        if (!this._icon) {
+            this._icon = params.icon || this.source.createIcon(NOTIFICATION_ICON_SIZE);
             this._table.add(this._icon, { row: 0,
                                           col: 0,
                                           x_expand: false,
@@ -451,10 +450,11 @@ const Notification = new Lang.Class({
                                           y_align: St.Align.START });
         }
 
-        if (params.secondaryGIcon) {
-            this._secondaryIcon = new St.Icon({ gicon: params.secondaryGIcon,
-                                                style_class: 'secondary-icon' });
-            this._bannerBox.add_actor(this._secondaryIcon);
+        if (!this._secondaryIcon) {
+            this._secondaryIcon = params.secondaryIcon;
+
+            if (this._secondaryIcon)
+                this._bannerBox.add_actor(this._secondaryIcon);
         }
 
         this.title = title;
@@ -611,8 +611,6 @@ const Notification = new Lang.Class({
     setImage: function(image) {
         if (this._imageBin)
             this.unsetImage();
-        if (!image)
-            return;
         this._imageBin = new St.Bin();
         this._imageBin.child = image;
         this._imageBin.opacity = 230;
@@ -716,10 +714,6 @@ const Notification = new Lang.Class({
         this.isTransient = isTransient;
     },
 
-    setForFeedback: function(forFeedback) {
-        this.forFeedback = forFeedback;
-    },
-
     setUseActionIcons: function(useIcons) {
         this._useActionIcons = useIcons;
     },
@@ -1090,14 +1084,14 @@ const Source = new Lang.Class({
         item = new PopupMenu.PopupMenuItem(_("Open"));
         item.connect('activate', Lang.bind(this, function() {
             this.open();
-            this.emit('done-displaying-content', true);
+            this.emit('done-displaying-content');
         }));
         rightClickMenu.add(item.actor);
 
         item = new PopupMenu.PopupMenuItem(_("Remove"));
         item.connect('activate', Lang.bind(this, function() {
             this.destroy();
-            this.emit('done-displaying-content', false);
+            this.emit('done-displaying-content');
         }));
         rightClickMenu.add(item.actor);
         return rightClickMenu;
@@ -1123,14 +1117,10 @@ const Source = new Lang.Class({
     // Provides a sane default implementation, override if you need
     // something more fancy.
     createIcon: function(size) {
-        return new St.Icon({ gicon: this.getIcon(),
+        return new St.Icon({ icon_name: this.iconName,
                              icon_size: size });
     },
 
-    getIcon: function() {
-        return new Gio.ThemedIcon({ name: this.iconName });
-    },
-
     _ensureMainIcon: function() {
         if (this._mainIcon)
             return;
@@ -1343,7 +1333,7 @@ const SummaryItem = new Lang.Class({
     },
 
     _notificationDoneDisplaying: function() {
-        this.source.emit('done-displaying-content', true);
+        this.source.emit('done-displaying-content');
     },
 
     _notificationDestroyed: function(notification) {
@@ -1396,8 +1386,6 @@ const MessageTray = new Lang.Class({
                                                    y_expand: true,
                                                    x_expand: true,
                                                    layout_manager: new Clutter.BinLayout() });
-        this._notificationWidget.connect('key-release-event', Lang.bind(this, this._onNotificationKeyRelease));
-
         this.actor.add_actor(this._notificationWidget);
 
         this._notificationBin = new St.Bin({ y_expand: true });
@@ -1414,7 +1402,7 @@ const MessageTray = new Lang.Class({
             actor.grab_key_focus();
         }));
         global.focus_manager.add_group(this.actor);
-        this._summary = new St.BoxLayout({ style_class: 'message-tray-summary',
+        this._summary = new St.BoxLayout({ name: 'summary-mode',
                                            reactive: true,
                                            track_hover: true,
                                            x_align: Clutter.ActorAlign.END,
@@ -1443,19 +1431,19 @@ const MessageTray = new Lang.Class({
         this._clickedSummaryItem = null;
         this._clickedSummaryItemMouseButton = -1;
         this._clickedSummaryItemAllocationChangedId = 0;
+        this._pointerBarrier = 0;
 
         this._closeButton = makeCloseButton();
         this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
+        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
         this._notificationWidget.add_actor(this._closeButton);
 
-        this._idleMonitorBecameActiveId = 0;
+        this._idleMonitorWatchId = 0;
         this._userActiveWhileNotificationShown = false;
 
-        this.idleMonitor = new GnomeDesktop.IdleMonitor();
+        this.idleMonitor = Shell.IdleMonitor.get();
 
-        this._grabHelper = new GrabHelper.GrabHelper(this.actor,
-                                                     { keybindingMode: Main.KeybindingMode.MESSAGE_TRAY });
+        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
         this._grabHelper.addActor(this._summaryBoxPointer.actor);
         this._grabHelper.addActor(this.actor);
         if (Main.panel.statusArea.activities)
@@ -1472,7 +1460,6 @@ const MessageTray = new Lang.Class({
         this._pointerInTray = false;
         this._pointerInKeyboard = false;
         this._keyboardVisible = false;
-        this._keyboardUnderMessageTray = false;
         this._summaryState = State.HIDDEN;
         this._pointerInSummary = false;
         this._notificationClosed = false;
@@ -1487,7 +1474,6 @@ const MessageTray = new Lang.Class({
         this._reNotifyAfterHideNotification = null;
         this._inFullscreen = false;
         this._desktopClone = null;
-        this._inCtrlAltTab = false;
 
         this._lightbox = new Lightbox.Lightbox(global.window_group,
                                                { inhibitEvents: true,
@@ -1521,20 +1507,10 @@ const MessageTray = new Lang.Class({
 
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
 
-        Main.wm.addKeybinding('toggle-message-tray',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.MESSAGE_TRAY |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this.toggleAndNavigate));
-        Main.wm.addKeybinding('focus-active-notification',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.MESSAGE_TRAY |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._expandActiveNotification));
+        global.display.add_keybinding('toggle-message-tray',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this.toggleAndNavigate));
 
         this._summaryItems = [];
         this._chatSummaryItemsCount = 0;
@@ -1546,34 +1522,15 @@ const MessageTray = new Lang.Class({
         this._trayDwellUserTime = 0;
 
         this._sessionUpdated();
-        this._updateNoMessagesLabel();
-    },
-
-    _updateNoMessagesLabel: function() {
-        if (this._summaryItems.length == 0 && !this._noMessages) {
-            this._noMessages = new St.Label({ text: _("No Messages"),
-                                              style_class: 'no-messages-label',
-                                              x_align: Clutter.ActorAlign.CENTER,
-                                              x_expand: true,
-                                              y_align: Clutter.ActorAlign.CENTER,
-                                              y_expand: true });
-            this.actor.add_actor(this._noMessages);
-        } else if (this._summaryItems.length > 0 && this._noMessages) {
-            this._noMessages.destroy();
-            this._noMessages = null;
-        }
     },
 
     _sessionUpdated: function() {
-        if ((Main.sessionMode.isLocked || Main.sessionMode.isGreeter) && this._inCtrlAltTab) {
+        if (Main.sessionMode.isLocked || Main.sessionMode.isGreeter)
             Main.ctrlAltTabManager.removeGroup(this._summary);
-            this._inCtrlAltTab = false;
-        } else if (!this._inCtrlAltTab) {
-            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'user-available-symbolic',
+        else
+            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'start-here-symbolic',
                                             { focusCallback: Lang.bind(this, this.toggleAndNavigate),
                                               sortGroup: CtrlAltTab.SortGroup.BOTTOM });
-            this._inCtrlAltTab = true;
-        }
         this._updateState();
     },
 
@@ -1611,8 +1568,6 @@ const MessageTray = new Lang.Class({
     },
 
     _trayDwellTimeout: function() {
-        this._trayDwellTimeoutId = 0;
-
         if (Main.modalCount > 0)
             return false;
 
@@ -1623,25 +1578,15 @@ const MessageTray = new Lang.Class({
         if (currentUserTime != this._trayDwellUserTime)
             return false;
 
+        this._trayDwellTimeoutId = 0;
+
         this._traySummoned = true;
         this._updateState();
 
         return false;
     },
 
-    _onNotificationKeyRelease: function(actor, event) {
-        let ignoredModifiers = global.display.get_ignored_modifier_mask();
-        let modifierState = event.get_state() & ~ignoredModifiers;
-
-        if (event.get_key_symbol() == Clutter.KEY_Escape && modifierState == 0) {
-            this._closeNotification();
-            return true;
-        }
-
-        return false;
-    },
-
-    _closeNotification: function() {
+    _onCloseClicked: function() {
         if (this._notificationState == State.SHOWN) {
             this._closeButton.hide();
             this._notificationClosed = true;
@@ -1709,8 +1654,6 @@ const MessageTray = new Lang.Class({
         Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { this._updateState(); return false; }));
 
         this.emit('summary-item-added', summaryItem);
-
-        this._updateNoMessagesLabel();
     },
 
     getSummaryItems: function() {
@@ -1743,8 +1686,6 @@ const MessageTray = new Lang.Class({
 
         summaryItemToRemove.actor.destroy();
 
-        this._updateNoMessagesLabel();
-
         if (needUpdate)
             this._updateState();
     },
@@ -1930,15 +1871,12 @@ const MessageTray = new Lang.Class({
     },
 
     _onKeyboardVisibleChanged: function(layoutManager, keyboardVisible) {
-        let keyboardUnderMessageTray = layoutManager.keyboardIndex == layoutManager.bottomIndex;
-        if (this._keyboardVisible == keyboardVisible &&
-            this._keyboardUnderMesssageTray == keyboardUnderMessageTray)
+        if (this._keyboardVisible == keyboardVisible)
             return;
 
         this._keyboardVisible = keyboardVisible;
-        this._keyboardUnderMessageTray = keyboardUnderMessageTray;
 
-        if (keyboardVisible && keyboardUnderMessageTray)
+        if (keyboardVisible)
             this.actor.add_style_pseudo_class('keyboard');
         else
             this.actor.remove_style_pseudo_class('keyboard');
@@ -2008,9 +1946,8 @@ const MessageTray = new Lang.Class({
         // Notifications
         let notificationQueue = this._notificationQueue;
         let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationForFeedback = notificationQueue.length > 0 && notificationQueue[0].forFeedback;
         let notificationsLimited = this._busy || this._inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && Main.sessionMode.hasNotifications;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
         let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
         let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
         let notificationExpanded = this._notification && this._notification.expanded;
@@ -2042,7 +1979,8 @@ const MessageTray = new Lang.Class({
         let summaryPinned = this._pointerInTray || summarySummoned || this._locked;
         let summaryHovered = this._pointerInTray || this._pointerInSummary;
 
-        let notificationsVisible = this._notificationState != State.HIDDEN;
+        let notificationsVisible = (this._notificationState == State.SHOWING ||
+                                    this._notificationState == State.SHOWN);
         let notificationsDone = !notificationsVisible && !notificationsPending;
 
         let summaryOptionalInOverview = this._overviewVisible && !this._locked && !summaryHovered;
@@ -2095,12 +2033,12 @@ const MessageTray = new Lang.Class({
                                      this._desktopCloneState == State.SHOWN);
         let desktopCloneShouldBeVisible = (trayShouldBeVisible &&
                                            !this._overviewVisible &&
-                                           (!this._keyboardVisible || !this._keyboardUnderMessageTray));
+                                           !this._keyboardVisible);
 
         if (!desktopCloneIsVisible && desktopCloneShouldBeVisible) {
             this._showDesktopClone();
         } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
-            this._hideDesktopClone (this._keyboardVisible && this._keyboardUnderMessageTray);
+            this._hideDesktopClone (this._keyboardVisible);
         }
     },
 
@@ -2113,8 +2051,6 @@ const MessageTray = new Lang.Class({
         params.onCompleteScope = this;
         params.onCompleteParams = [statevar, value, onComplete, onCompleteScope, onCompleteParams];
 
-        // Remove other tweens that could mess with the state machine
-        Tweener.removeTweens(actor);
         Tweener.addTween(actor, params);
 
         let valuing = (value == State.SHOWN) ? State.SHOWING : State.HIDING;
@@ -2217,26 +2153,20 @@ const MessageTray = new Lang.Class({
                     });
     },
 
-    _onIdleMonitorBecameActive: function() {
-        this.idleMonitor.disconnect(this._idleMonitorBecameActiveId);
-        this._idleMonitorBecameActiveId = 0;
-
+    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
+        this.idleMonitor.remove_watch(this._idleMonitorWatchId);
+        this._idleMonitorWatchId = 0;
+        if (!userBecameIdle)
+            this._updateNotificationTimeout(2000);
         this._userActiveWhileNotificationShown = true;
-        this._updateNotificationTimeout(2000);
         this._updateState();
     },
 
     _showNotification: function() {
         this._notification = this._notificationQueue.shift();
-
-        let userIdle = this.idleMonitor.get_idletime() > IDLE_TIME;
-        if (userIdle) {
-            this._userActiveWhileNotificationShown = false;
-            this._idleMonitorBecameActiveId = this.idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
-        } else {
-            this._userActiveWhileNotificationShown = true;
-        }
-
+        this._userActiveWhileNotificationShown = this.idleMonitor.get_idletime() <= IDLE_TIME;
+        this._idleMonitorWatchId = this.idleMonitor.add_watch(IDLE_TIME,
+                                                              Lang.bind(this, this._onIdleMonitorWatch));
         this._notificationClickedId = this._notification.connect('done-displaying',
                                                                  Lang.bind(this, this._escapeTray));
         this._notification.connect('unfocused', Lang.bind(this, function() {
@@ -2268,28 +2198,40 @@ const MessageTray = new Lang.Class({
     _updateShowingNotification: function() {
         this._notification.acknowledged = true;
 
+        Tweener.removeTweens(this._notificationWidget);
+
         // We auto-expand notifications with CRITICAL urgency.
-        if (this._notification.urgency == Urgency.CRITICAL)
+        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
+        // updating, in case that notification was in the process of being hidden. However,
+        // Tweener.removeTweens() would also remove a tween that was updating the position of the
+        // notification we are updating, in case that notification was already expanded and its height
+        // changed. Therefore we need to call this._expandNotification() for expanded notifications
+        // to make sure their position is updated.
+        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
             this._expandNotification(true);
 
         // We tween all notifications to full opacity. This ensures that both new notifications and
         // notifications that might have been in the process of hiding get full opacity.
         //
-        // We tween any notification showing in the banner mode to the appropriate height
-        // (which is banner height or expanded height, depending on the notification state)
+        // We tween any notification showing in the banner mode to banner height
+        // (this._notificationWidget.y = -this._notificationWidget.height).
         // This ensures that both new notifications and notifications in the banner mode that might
-        // have been in the process of hiding are shown with the correct height.
+        // have been in the process of hiding are shown with the banner height.
         //
         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
         // notification is being shown.
-
+        //
+        // We don't set the y parameter for the tween for expanded notifications because
+        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
+        // fully expanded value.
         let tweenParams = { opacity: 255,
-                            y: -this._notificationWidget.height,
                             time: ANIMATION_TIME,
                             transition: 'easeOutQuad',
                             onComplete: this._showNotificationCompleted,
                             onCompleteScope: this
                           };
+        if (!this._notification.expanded)
+            tweenParams.y = -this._notificationWidget.height;
 
         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
    },
@@ -2335,32 +2277,14 @@ const MessageTray = new Lang.Class({
     },
 
     _hideNotification: function() {
-        // HACK!
-        // There seems to be a reentrancy issue in calling .ungrab() here,
-        // which causes _updateState to be called before _notificationState
-        // becomes HIDING. That hides the notification again, nullifying the
-        // object but not setting _notificationState (and that's the weird part)
-        // As then _notificationState is stuck into SHOWN but _notification
-        // is null, every new _updateState fails and the message tray is
-        // lost forever.
-        //
-        // See more at https://bugzilla.gnome.org/show_bug.cgi?id=683986
-        this._notificationState = State.HIDING;
-
         this._grabHelper.ungrab({ actor: this._notification.actor });
 
-        if (this._idleMonitorBecameActiveId) {
-            this.idleMonitor.disconnect(this._idleMonitorBecameActiveId);
-            this._idleMonitorBecameActiveId = 0;
-        }
-
         if (this._notificationExpandedId) {
             this._notification.disconnect(this._notificationExpandedId);
             this._notificationExpandedId = 0;
         }
 
         if (this._notificationRemoved) {
-            Tweener.removeTweens(this._notificationWidget);
             this._notificationWidget.y = this.actor.height;
             this._notificationWidget.opacity = 0;
             this._notificationState = State.HIDDEN;
@@ -2394,13 +2318,6 @@ const MessageTray = new Lang.Class({
             notification.destroy(NotificationDestroyedReason.EXPIRED);
     },
 
-    _expandActiveNotification: function() {
-        if (!this._notification)
-            return;
-
-        this._expandNotification(false);
-    },
-
     _expandNotification: function(autoExpanding) {
         // Don't grab focus in notifications that are auto-expanded.
         if (!autoExpanding)
@@ -2424,11 +2341,8 @@ const MessageTray = new Lang.Class({
         if (this._notificationWidget.y < expandedY) {
             this._notificationWidget.y = expandedY;
         } else if (this._notification.y != expandedY) {
-            // Tween also opacity here, to override a possible tween that's
-            // currently hiding the notification.
             this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
                         { y: expandedY,
-                          opacity: 255,
                           time: ANIMATION_TIME,
                           transition: 'easeOutQuad'
                         });
@@ -2459,21 +2373,12 @@ const MessageTray = new Lang.Class({
                     });
     },
 
-    _onSourceDoneDisplayingContent: function(source, closeTray) {
-        if (closeTray) {
-            this._escapeTray();
-        } else {
-            this._setClickedSummaryItem(null);
-            this._updateState();
-        }
-    },
-
     _showSummaryBoxPointer: function() {
         this._summaryBoxPointerItem = this._clickedSummaryItem;
         this._summaryBoxPointerContentUpdatedId = this._summaryBoxPointerItem.connect('content-updated',
                                                                                       Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
         this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
-                                                                                  Lang.bind(this, this._onSourceDoneDisplayingContent));
+                                                                                  Lang.bind(this, this._escapeTray));
 
         let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
         if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
@@ -2496,7 +2401,6 @@ const MessageTray = new Lang.Class({
             this._summaryBoxPointerItem.prepareNotificationStackForShowing();
         } else if (this._clickedSummaryItemMouseButton == 3) {
             this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu;
-            this._summaryBoxPointerCloseClickedId = 0;
         }
 
         this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
@@ -2603,10 +2507,8 @@ const MessageTray = new Lang.Class({
         this._summaryBoxPointer.bin.child = null;
         this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId);
         this._summaryBoxPointerContentUpdatedId = 0;
-        if (this._summaryBoxPointerCloseClickedId != 0) {
-            this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId);
-            this._summaryBoxPointerCloseClickedId = 0;
-        }
+        this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId);
+        this._summaryBoxPointerCloseClickedId = 0;
         this._summaryBoxPointerItem.source.disconnect(this._sourceDoneDisplayingId);
         this._summaryBoxPointerDoneDisplayingId = 0;
 

js/ui/modalDialog.js

@@ -20,6 +20,7 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
 const OPEN_AND_CLOSE_TIME = 0.1;
+const FADE_IN_BUTTONS_TIME = 0.33;
 const FADE_OUT_DIALOG_TIME = 1.0;
 
 const State = {
@@ -37,12 +38,10 @@ const ModalDialog = new Lang.Class({
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
                                         parentActor: Main.uiGroup,
-                                        keybindingMode: Main.KeybindingMode.SYSTEM_MODAL,
                                         shouldFadeIn: true });
 
         this.state = State.CLOSED;
         this._hasModal = false;
-        this._keybindingMode = params.keybindingMode;
         this._shellReactive = params.shellReactive;
         this._shouldFadeIn = params.shouldFadeIn;
 
@@ -58,7 +57,7 @@ const ModalDialog = new Lang.Class({
 
         this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
 
-        this._buttonKeys = {};
+        this._actionKeys = {};
         this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));
 
         this._backgroundBin = new St.Bin();
@@ -95,9 +94,10 @@ const ModalDialog = new Lang.Class({
                                 x_align: St.Align.MIDDLE,
                                 y_align: St.Align.START });
 
-        this.buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
-                                               vertical: false });
-        this.dialogLayout.add(this.buttonLayout,
+        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+                                                visible:     false,
+                                                vertical:    false });
+        this.dialogLayout.add(this._buttonLayout,
                               { expand:  true,
                                 x_align: St.Align.MIDDLE,
                                 y_align: St.Align.END });
@@ -112,16 +112,37 @@ const ModalDialog = new Lang.Class({
         this._group.destroy();
     },
 
-    clearButtons: function() {
-        this.buttonLayout.destroy_all_children();
-        this._buttonKeys = {};
+    setActionKey: function(key, action) {
+        this._actionKeys[key] = action;
     },
 
     setButtons: function(buttons) {
-        this.clearButtons();
+        let hadChildren = this._buttonLayout.get_children() > 0;
+
+        this._buttonLayout.destroy_all_children();
+        this._actionKeys = {};
+
+        this._buttonLayout.visible = (buttons.length > 0);
 
         for (let i = 0; i < buttons.length; i++) {
             let buttonInfo = buttons[i];
+            let label = buttonInfo['label'];
+            let action = buttonInfo['action'];
+            let key = buttonInfo['key'];
+            let isDefault = buttonInfo['default'];
+
+            if (isDefault && !key) {
+                this._actionKeys[Clutter.KEY_KP_Enter] = action;
+                this._actionKeys[Clutter.KEY_ISO_Enter] = action;
+                key = Clutter.KEY_Return;
+            }
+
+            buttonInfo.button = new St.Button({ style_class: 'modal-dialog-button',
+                                                reactive:    true,
+                                                can_focus:   true,
+                                                label:       label });
+            if (isDefault)
+                buttonInfo.button.add_style_pseudo_class('default');
 
             let x_alignment;
             if (buttons.length == 1)
@@ -133,62 +154,43 @@ const ModalDialog = new Lang.Class({
             else
                 x_alignment = St.Align.MIDDLE;
 
-            this.addButton(buttonInfo, { expand: true,
-                                         x_fill: false,
-                                         y_fill: false,
-                                         x_align: x_alignment,
-                                         y_align: St.Align.MIDDLE });
+            if (!this._initialKeyFocusDestroyId)
+                this._initialKeyFocus = buttonInfo.button;
+            this._buttonLayout.add(buttonInfo.button,
+                                   { expand: true,
+                                     x_fill: false,
+                                     y_fill: false,
+                                     x_align: x_alignment,
+                                     y_align: St.Align.MIDDLE });
+
+            buttonInfo.button.connect('clicked', action);
+
+            if (key)
+                this._actionKeys[key] = action;
         }
-    },
 
-    addButton: function(buttonInfo, layoutInfo) {
-        let label = buttonInfo['label'];
-        let action = buttonInfo['action'];
-        let key = buttonInfo['key'];
-        let isDefault = buttonInfo['default'];
+        // Fade in buttons if there weren't any before
+        if (!hadChildren && buttons.length > 0) {
+            this._buttonLayout.opacity = 0;
+            Tweener.addTween(this._buttonLayout,
+                             { opacity: 255,
+                               time: FADE_IN_BUTTONS_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this, function() {
+                                   this.emit('buttons-set');
+                               })
+                             });
+        } else {
+            this.emit('buttons-set');
+        }
 
-        let keys;
-
-        if (key)
-            keys = [key];
-        else if (isDefault)
-            keys = [Clutter.KEY_Return, Clutter.KEY_KP_Enter, Clutter.KEY_ISO_Enter];
-        else
-            keys = [];
-
-        let button = new St.Button({ style_class: 'modal-dialog-button',
-                                     reactive:    true,
-                                     can_focus:   true,
-                                     label:       label });
-        button.connect('clicked', action);
-
-        buttonInfo['button'] = button;
-
-        if (isDefault)
-            button.add_style_pseudo_class('default');
-
-        if (!this._initialKeyFocusDestroyId)
-            this._initialKeyFocus = button;
-
-        for (let i in keys)
-            this._buttonKeys[keys[i]] = buttonInfo;
-
-        this.buttonLayout.add(button, layoutInfo);
-
-        return button;
     },
 
     _onKeyReleaseEvent: function(object, event) {
         let symbol = event.get_key_symbol();
-        let buttonInfo = this._buttonKeys[symbol];
+        let action = this._actionKeys[symbol];
 
-        if (!buttonInfo)
-            return false;
-
-        let button = buttonInfo['button'];
-        let action = buttonInfo['action'];
-
-        if (action && button.reactive) {
+        if (action) {
             action();
             return true;
         }
@@ -241,7 +243,7 @@ const ModalDialog = new Lang.Class({
         if (this.state == State.OPENED || this.state == State.OPENING)
             return true;
 
-        if (!this.pushModal({ timestamp: timestamp }))
+        if (!this.pushModal(timestamp))
             return false;
 
         this._fadeOpen(onPrimary);
@@ -291,8 +293,7 @@ const ModalDialog = new Lang.Class({
     pushModal: function (timestamp) {
         if (this._hasModal)
             return true;
-        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           keybindingMode: this._keybindingMode }))
+        if (!Main.pushModal(this._group, timestamp))
             return false;
 
         this._hasModal = true;

js/ui/notificationDaemon.js

@@ -127,42 +127,42 @@ const NotificationDaemon = new Lang.Class({
         this._trayManager.manage_stage(global.stage, Main.messageTray.actor);
     },
 
-    _imageForNotificationData: function(hints) {
-        if (hints['image-data']) {
+    _iconForNotificationData: function(icon, hints) {
+        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
+        // and don't show a large image. There are currently many applications that use
+        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
+        // the 'image-data' hint. These applications don't typically pass in 'app_icon'
+        // argument to Notify() and actually expect the pixbuf to be shown as an icon.
+        // So the logic here does the right thing for this case. If both an icon and either
+        // one of 'image-data' or 'image-path' are specified, we show both an icon and
+        // a large image.
+        if (icon) {
+            if (icon.substr(0, 7) == 'file://')
+                return new Gio.FileIcon({ file: Gio.File.new_for_uri(icon) });
+            else if (icon[0] == '/') {
+                return new Gio.FileIcon({ file: Gio.File.new_for_path(icon) });
+            } else
+                return new Gio.ThemedIcon({ name: icon });
+        } else if (hints['image-data']) {
             let [width, height, rowStride, hasAlpha,
                  bitsPerSample, nChannels, data] = hints['image-data'];
             return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                       bitsPerSample, width, height, rowStride);
         } else if (hints['image-path']) {
             return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
+        } else {
+            let stockIcon;
+            switch (hints.urgency) {
+                case Urgency.LOW:
+                case Urgency.NORMAL:
+                    stockIcon = 'gtk-dialog-info';
+                    break;
+                case Urgency.CRITICAL:
+                    stockIcon = 'gtk-dialog-error';
+                    break;
+            }
+            return new Gio.ThemedIcon({ name: stockIcon });
         }
-        return null;
-    },
-
-    _fallbackIconForNotificationData: function(hints) {
-        let stockIcon;
-        switch (hints.urgency) {
-            case Urgency.LOW:
-            case Urgency.NORMAL:
-                stockIcon = 'gtk-dialog-info';
-                break;
-            case Urgency.CRITICAL:
-                stockIcon = 'gtk-dialog-error';
-                break;
-        }
-        return new Gio.ThemedIcon({ name: stockIcon });
-    },
-
-    _iconForNotificationData: function(icon) {
-        if (icon) {
-            if (icon.substr(0, 7) == 'file://')
-                return new Gio.FileIcon({ file: Gio.File.new_for_uri(icon) });
-            else if (icon[0] == '/')
-                return new Gio.FileIcon({ file: Gio.File.new_for_path(icon) });
-            else
-                return new Gio.ThemedIcon({ name: icon });
-        }
-        return null;
     },
 
     _lookupSource: function(title, pid, trayIcon) {
@@ -355,8 +355,14 @@ const NotificationDaemon = new Lang.Class({
             [ndata.id, ndata.icon, ndata.summary, ndata.body,
              ndata.actions, ndata.hints, ndata.notification];
 
+        let gicon = this._iconForNotificationData(icon, hints);
+        let iconActor = new St.Icon({ gicon: gicon,
+                                      icon_size: MessageTray.NOTIFICATION_ICON_SIZE });
+
         if (notification == null) {
-            notification = new MessageTray.Notification(source);
+            notification = new MessageTray.Notification(source, summary, body,
+                                                        { icon: iconActor,
+                                                          bannerMarkup: true });
             ndata.notification = notification;
             notification.connect('destroy', Lang.bind(this,
                 function(n, reason) {
@@ -379,33 +385,29 @@ const NotificationDaemon = new Lang.Class({
                 function(n, actionId) {
                     this._emitActionInvoked(ndata.id, actionId);
                 }));
+        } else {
+            notification.update(summary, body, { icon: iconActor,
+                                                 bannerMarkup: true,
+                                                 clear: true });
         }
 
-        let gicon = this._iconForNotificationData(icon, hints);
-        let gimage = this._imageForNotificationData(hints);
-
-        let image = null;
-
-        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
-        // and don't show a large image. There are currently many applications that use
-        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
-        // the 'image-data' hint. These applications don't typically pass in 'app_icon'
-        // argument to Notify() and actually expect the pixbuf to be shown as an icon.
-        // So the logic here does the right thing for this case. If both an icon and either
-        // one of 'image-data' or 'image-path' are specified, we show both an icon and
-        // a large image.
-        if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage });
-        else if (!gicon && gimage)
-            gicon = gimage;
-        else if (!gicon)
-            gicon = this._fallbackIconForNotificationData(hints);
-
-        notification.setImage(image);
-
-        notification.update(summary, body, { gicon: gicon,
-                                             bannerMarkup: true,
-                                             clear: true });
+        // We only display a large image if an icon is also specified.
+        if (icon && (hints['image-data'] || hints['image-path'])) {
+            let image = null;
+            if (hints['image-data']) {
+                let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = hints['image-data'];
+                image = St.TextureCache.get_default().load_from_raw(data, hasAlpha,
+                                                                    width, height, rowStride, notification.IMAGE_SIZE);
+            } else if (hints['image-path']) {
+                image = St.TextureCache.get_default().load_uri_async(GLib.filename_to_uri(hints['image-path'], null),
+                                                                     notification.IMAGE_SIZE,
+                                                                     notification.IMAGE_SIZE);
+            }
+            notification.setImage(image);
+        } else {
+            notification.unsetImage();
+        }
 
         if (actions.length) {
             notification.setUseActionIcons(hints['action-icons'] == true);
@@ -435,7 +437,7 @@ const NotificationDaemon = new Lang.Class({
         // of the 'transient' hint with hints['transient'] rather than hints.transient
         notification.setTransient(hints['transient'] == true);
 
-        let sourceGIcon = source.useNotificationIcon ? gicon : null;
+        let sourceGIcon = source.useNotificationIcon ? this._iconForNotificationData(icon, hints) : null;
         source.processNotification(notification, sourceGIcon);
     },
 

js/ui/overview.js

@@ -23,25 +23,22 @@ const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;
 
+// We split the screen vertically between the dash and the view selector.
+const DASH_SPLIT_FRACTION = 0.1;
+
 const DND_WINDOW_SWITCH_TIMEOUT = 1250;
 
-const GLSL_DIM_EFFECT_DECLARATIONS = '';
-const GLSL_DIM_EFFECT_CODE = '\
-   vec2 dist = cogl_tex_coord_in[0].xy - vec2(0.5, 0.5); \
-   float elipse_radius = 0.5; \
-   /* from https://bugzilla.gnome.org/show_bug.cgi?id=669798: \
-      the alpha on the gradient goes from 250 at its darkest to 180 at its most transparent. */ \
-   float y = 250.0 / 255.0; \
-   float x = 180.0 / 255.0; \
-   /* interpolate darkening value, based on distance from screen center */ \
-   float val = min(length(dist), elipse_radius); \
-   float a = mix(x, y, val / elipse_radius); \
-   /* dim_factor varies from [1.0 -> 0.5] when overview is showing \
-      We use it to smooth value, then we clamp it to valid color interval */ \
-   a = clamp(a - cogl_color_in.r + 0.5, 0.0, 1.0); \
-   /* We\'re blending between: color and black color (obviously omitted in the equation) */ \
-   cogl_color_out.xyz = cogl_color_out.xyz * (1.0 - a); \
-   cogl_color_out.a = 1.0;';
+const SwipeScrollDirection = {
+    NONE: 0,
+    HORIZONTAL: 1,
+    VERTICAL: 2
+};
+
+const SwipeScrollResult = {
+    CANCEL: 0,
+    SWIPE: 1,
+    CLICK: 2
+};
 
 const ShellInfo = new Lang.Class({
     Name: 'ShellInfo',
@@ -60,14 +57,7 @@ const ShellInfo = new Lang.Class({
             this._source.destroy();
     },
 
-    setMessage: function(text, options) {
-        options = Params.parse(options, { undoCallback: null,
-                                          forFeedback: false
-                                        });
-
-        let undoCallback = options.undoCallback;
-        let forFeedback = options.forFeedback;
-
+    setMessage: function(text, undoCallback, undoLabel) {
         if (this._source == null) {
             this._source = new MessageTray.SystemNotificationSource();
             this._source.connect('destroy', Lang.bind(this,
@@ -81,7 +71,6 @@ const ShellInfo = new Lang.Class({
         if (this._source.notifications.length == 0) {
             notification = new MessageTray.Notification(this._source, text, null);
             notification.setTransient(true);
-            notification.setForFeedback(forFeedback);
         } else {
             notification = this._source.notifications[0];
             notification.update(text, null, { clear: true });
@@ -89,8 +78,10 @@ const ShellInfo = new Lang.Class({
 
         this._undoCallback = undoCallback;
         if (undoCallback) {
-            notification.addButton('system-undo', _("Undo"));
-            notification.connect('action-invoked', Lang.bind(this, this._onUndoClicked));
+            notification.addButton('system-undo',
+                                   undoLabel ? undoLabel : _("Undo"));
+            notification.connect('action-invoked',
+                                 Lang.bind(this, this._onUndoClicked));
         }
 
         this._source.notify(notification);
@@ -102,7 +93,6 @@ const Overview = new Lang.Class({
 
     _init: function() {
         this._overviewCreated = false;
-        this._initCalled = false;
 
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
         this._sessionUpdated();
@@ -123,26 +113,32 @@ const Overview = new Lang.Class({
         // scenes which allows us to show the background with different
         // rendering options without duplicating the texture data.
         this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-        this._background.add_glsl_snippet(Meta.SnippetHook.FRAGMENT,
-                                          GLSL_DIM_EFFECT_DECLARATIONS,
-                                          GLSL_DIM_EFFECT_CODE,
-                                          false);
         this._background.hide();
         global.overlay_group.add_actor(this._background);
 
         this._desktopFade = new St.Bin();
         global.overlay_group.add_actor(this._desktopFade);
 
+        this._spacing = 0;
+
         /* Translators: This is the main view to select
            activities. See also note for "Activities" string. */
-        this._overview = new St.BoxLayout({ name: 'overview',
-                                            accessible_name: _("Overview"),
-                                            reactive: true,
-                                            vertical: true });
-        this._overview._delegate = this;
-
-        this._group = new St.BoxLayout({ name: 'overview-group' });
+        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() {
+                let node = this._group.get_theme_node();
+                let spacing = node.get_length('spacing');
+                if (spacing != this._spacing) {
+                    this._spacing = spacing;
+                    this._relayout();
+                }
+            }));
 
+        this._scrollDirection = SwipeScrollDirection.NONE;
+        this._scrollAdjustment = null;
         this._capturedEventId = 0;
         this._buttonPressId = 0;
 
@@ -158,11 +154,12 @@ const Overview = new Lang.Class({
         // Dash elements, or mouseover handlers in the workspaces.
         this._coverPane = new Clutter.Rectangle({ opacity: 0,
                                                   reactive: true });
-        this._overview.add_actor(this._coverPane);
+        this._group.add_actor(this._coverPane);
         this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));
 
-        this._overview.hide();
-        global.overlay_group.add_actor(this._overview);
+
+        this._group.hide();
+        global.overlay_group.add_actor(this._group);
 
         this._coverPane.hide();
 
@@ -174,16 +171,11 @@ const Overview = new Lang.Class({
         Main.xdndHandler.connect('drag-begin', Lang.bind(this, this._onDragBegin));
         Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));
 
-        global.screen.connect('restacked', Lang.bind(this, this._onRestacked));
-
         this._windowSwitchTimeoutId = 0;
         this._windowSwitchTimestamp = 0;
         this._lastActiveWorkspaceIndex = -1;
         this._lastHoveredWindow = null;
         this._needsFakePointerEvent = false;
-
-        if (this._initCalled)
-            this.init();
     },
 
     _sessionUpdated: function() {
@@ -196,20 +188,11 @@ const Overview = new Lang.Class({
     // signal handlers and so forth. So we create them after
     // construction in this init() method.
     init: function() {
-        this._initCalled = true;
-
         if (this.isDummy)
             return;
 
         this._shellInfo = new ShellInfo();
 
-        // Add a clone of the panel to the overview so spacing and such is
-        // automatic
-        this._panelGhost = new St.Bin({ child: new Clutter.Clone({ source: Main.panel.actor }),
-                                        reactive: false,
-                                        opacity: 0 });
-        this._overview.add_actor(this._panelGhost);
-
         this._searchEntry = new St.Entry({ name: 'searchEntry',
                                            /* Translators: this is the text displayed
                                               in the search entry when no search is
@@ -218,13 +201,16 @@ const Overview = new Lang.Class({
                                            hint_text: _("Type to search..."),
                                            track_hover: true,
                                            can_focus: true });
-        this._searchEntryBin = new St.Bin({ child: this._searchEntry,
-                                            x_align: St.Align.MIDDLE });
-        this._overview.add_actor(this._searchEntryBin);
+        this._group.add_actor(this._searchEntry);
+
+        this._dash = new Dash.Dash();
+        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
+                                                           this._dash.showAppsButton);
+        this._group.add_actor(this._viewSelector.actor);
+        this._group.add_actor(this._dash.actor);
 
         // TODO - recalculate everything when desktop size changes
-        this._dash = new Dash.Dash();
-        this._group.add_actor(this._dash.actor);
+        this._dash.actor.add_constraint(this._viewSelector.constrainHeight);
         this.dashIconSize = this._dash.iconSize;
         this._dash.connect('icon-size-changed',
                            Lang.bind(this, function() {
@@ -235,23 +221,6 @@ const Overview = new Lang.Class({
         // the left of the overview
         Main.ctrlAltTabManager.addGroup(this._dash.actor, _("Dash"), 'user-bookmarks-symbolic');
 
-        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
-                                                           this._dash.showAppsButton);
-        this._group.add(this._viewSelector.actor, { x_fill: true,
-                                                    expand: true });
-
-        // Add our same-line elements after the search entry
-        this._overview.add(this._group, { y_fill: true,
-                                          expand: true });
-
-        // Then account for message tray
-        this._messageTrayGhost = new St.Bin({ style_class: 'message-tray-summary',
-                                              reactive: false,
-                                              opacity: 0,
-                                              x_fill: true,
-                                              y_fill: true });
-        this._overview.add_actor(this._messageTrayGhost);
-
         Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._relayout));
         this._relayout();
     },
@@ -264,16 +233,11 @@ const Overview = new Lang.Class({
         this._viewSelector.removeSearchProvider(provider);
     },
 
-    //
-    // options:
-    //  - undoCallback (function): the callback to be called if undo support is needed
-    //  - forFeedback (boolean): whether the message is for direct feedback of a user action
-    //
-    setMessage: function(text, options) {
+    setMessage: function(text, undoCallback, undoLabel) {
         if (this.isDummy)
             return;
 
-        this._shellInfo.setMessage(text, options);
+        this._shellInfo.setMessage(text, undoCallback, undoLabel);
     },
 
     _onDragBegin: function() {
@@ -344,11 +308,159 @@ const Overview = new Lang.Class({
         return DND.DragMotionResult.CONTINUE;
     },
 
-    addAction: function(action) {
+    setScrollAdjustment: function(adjustment, direction) {
         if (this.isDummy)
             return;
 
-        this._overview.add_action(action);
+        this._scrollAdjustment = adjustment;
+        if (this._scrollAdjustment == null)
+            this._scrollDirection = SwipeScrollDirection.NONE;
+        else
+            this._scrollDirection = direction;
+    },
+
+    _onButtonPress: function(actor, event) {
+        if (this._scrollDirection == SwipeScrollDirection.NONE
+            || event.get_button() != 1)
+            return;
+
+        let [stageX, stageY] = event.get_coords();
+        this._dragStartX = this._dragX = stageX;
+        this._dragStartY = this._dragY = stageY;
+        this._dragStartValue = this._scrollAdjustment.value;
+        this._lastMotionTime = -1; // used to track "stopping" while swipe-scrolling
+        this._capturedEventId = global.stage.connect('captured-event',
+            Lang.bind(this, this._onCapturedEvent));
+        this.emit('swipe-scroll-begin');
+    },
+
+    _onCapturedEvent: function(actor, event) {
+        let stageX, stageY;
+        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
+
+        switch(event.type()) {
+            case Clutter.EventType.BUTTON_RELEASE:
+                [stageX, stageY] = event.get_coords();
+
+                // default to snapping back to the original value
+                let newValue = this._dragStartValue;
+
+                let minValue = this._scrollAdjustment.lower;
+                let maxValue = this._scrollAdjustment.upper - this._scrollAdjustment.page_size;
+
+                let direction;
+                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
+                    direction = stageX > this._dragStartX ? -1 : 1;
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                        direction *= -1;
+                } else {
+                    direction = stageY > this._dragStartY ? -1 : 1;
+                }
+
+                // We default to scroll a full page size; both the first
+                // and the last page may be smaller though, so we need to
+                // adjust difference in those cases.
+                let difference = direction * this._scrollAdjustment.page_size;
+                if (this._dragStartValue + difference > maxValue)
+                    difference = maxValue - this._dragStartValue;
+                else if (this._dragStartValue + difference < minValue)
+                    difference = minValue - this._dragStartValue;
+
+                // If the user has moved more than half the scroll
+                // difference, we want to "settle" to the new value
+                // even if the user stops dragging rather "throws" by
+                // releasing during the drag.
+                let distance = this._dragStartValue - this._scrollAdjustment.value;
+                let noStop = Math.abs(distance / difference) > 0.5;
+
+                // We detect if the user is stopped by comparing the
+                // timestamp of the button release with the timestamp of
+                // the last motion. Experimentally, a difference of 0 or 1
+                // millisecond indicates that the mouse is in motion, a
+                // larger difference indicates that the mouse is stopped.
+                if ((this._lastMotionTime > 0 &&
+                     this._lastMotionTime > event.get_time() - 2) ||
+                    noStop) {
+                    if (this._dragStartValue + difference >= minValue &&
+                        this._dragStartValue + difference <= maxValue)
+                        newValue += difference;
+                }
+
+                let result;
+
+                // See if the user has moved the mouse enough to trigger
+                // a drag
+                if (Math.abs(stageX - this._dragStartX) < threshold &&
+                    Math.abs(stageY - this._dragStartY) < threshold) {
+                    // no motion? It's a click!
+                    result = SwipeScrollResult.CLICK;
+                    this.emit('swipe-scroll-end', result);
+                } else {
+                    if (newValue == this._dragStartValue)
+                        result = SwipeScrollResult.CANCEL;
+                    else
+                        result = SwipeScrollResult.SWIPE;
+
+                    // The event capture handler is disconnected
+                    // while scrolling to the final position, so
+                    // to avoid undesired prelights we raise
+                    // the cover pane.
+                    this._coverPane.raise_top();
+                    this._coverPane.show();
+
+                    Tweener.addTween(this._scrollAdjustment,
+                                     { value: newValue,
+                                       time: ANIMATION_TIME,
+                                       transition: 'easeOutQuad',
+                                       onCompleteScope: this,
+                                       onComplete: function() {
+                                          this._coverPane.hide();
+                                          this.emit('swipe-scroll-end',
+                                                    result);
+                                       }
+                                     });
+                }
+
+                global.stage.disconnect(this._capturedEventId);
+                this._capturedEventId = 0;
+
+                return result != SwipeScrollResult.CLICK;
+
+            case Clutter.EventType.MOTION:
+                [stageX, stageY] = event.get_coords();
+                let dx = this._dragX - stageX;
+                let dy = this._dragY - stageY;
+                let primary = Main.layoutManager.primaryMonitor;
+
+                this._dragX = stageX;
+                this._dragY = stageY;
+                this._lastMotionTime = event.get_time();
+
+                // See if the user has moved the mouse enough to trigger
+                // a drag
+                if (Math.abs(stageX - this._dragStartX) < threshold &&
+                    Math.abs(stageY - this._dragStartY) < threshold)
+                    return true;
+
+                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
+                    if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                        this._scrollAdjustment.value -= (dx / primary.width) * this._scrollAdjustment.page_size;
+                    else
+                        this._scrollAdjustment.value += (dx / primary.width) * this._scrollAdjustment.page_size;
+                } else {
+                    this._scrollAdjustment.value += (dy / primary.height) * this._scrollAdjustment.page_size;
+                }
+
+                return true;
+
+            // Block enter/leave events to avoid prelights
+            // during swipe-scroll
+            case Clutter.EventType.ENTER:
+            case Clutter.EventType.LEAVE:
+                return true;
+        }
+
+        return false;
     },
 
     _getDesktopClone: function() {
@@ -374,27 +486,41 @@ const Overview = new Lang.Class({
         this.hide();
 
         let primary = Main.layoutManager.primaryMonitor;
+        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;
 
-        this._overview.set_position(primary.x, primary.y);
-        this._overview.set_size(primary.width, primary.height);
+        this._group.set_position(primary.x, primary.y);
+        this._group.set_size(primary.width, primary.height);
 
         this._coverPane.set_position(0, contentY);
         this._coverPane.set_size(primary.width, contentHeight);
-    },
 
-    _onRestacked: function() {
-        let stack = global.get_window_actors();
-        let stackIndices = {};
+        let searchWidth = this._searchEntry.get_width();
+        let searchHeight = this._searchEntry.get_height();
+        let searchX = (primary.width - searchWidth) / 2;
+        let searchY = contentY + this._spacing;
 
-        for (let i = 0; i < stack.length; i++) {
-            // Use the stable sequence for an integer to use as a hash key
-            stackIndices[stack[i].get_meta_window().get_stable_sequence()] = i;
+        let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width);
+        let dashY = searchY + searchHeight + this._spacing;
+        let dashX;
+        if (rtl) {
+            this._dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
+            dashX = primary.width;
+        } else {
+            dashX = 0;
         }
 
-        this.emit('windows-restacked', stackIndices);
+        let viewX = rtl ? 0 : dashWidth + this._spacing;
+        let viewY = searchY + searchHeight + this._spacing;
+        let viewWidth = primary.width - dashWidth - this._spacing;
+        let viewHeight = contentHeight - this._spacing - viewY;
+
+        this._searchEntry.set_position(searchX, searchY);
+        this._dash.actor.set_position(dashX, dashY);
+        this._viewSelector.actor.set_position(viewX, viewY);
+        this._viewSelector.actor.set_size(viewWidth, viewHeight);
     },
 
     //// Public methods ////
@@ -431,11 +557,15 @@ const Overview = new Lang.Class({
             return;
         if (this._shown)
             return;
-        this._shown = true;
-        this._syncInputMode();
-        if (!this._modal)
+        // Do this manually instead of using _syncInputMode, to handle failure
+        if (!Main.pushModal(this._group))
             return;
+        this._modal = true;
         this._animateVisible();
+        this._shown = true;
+
+        this._buttonPressId = this._group.connect('button-press-event',
+            Lang.bind(this, this._onButtonPress));
     },
 
     fadeInDesktop: function() {
@@ -478,12 +608,12 @@ const Overview = new Lang.Class({
         // Disable unredirection while in the overview
         Meta.disable_unredirect_for_screen(global.screen);
         global.window_group.hide();
-        this._overview.show();
+        this._group.show();
         this._background.show();
         this._viewSelector.show();
 
-        this._overview.opacity = 0;
-        Tweener.addTween(this._overview,
+        this._group.opacity = 0;
+        Tweener.addTween(this._group,
                          { opacity: 255,
                            transition: 'easeOutQuad',
                            time: ANIMATION_TIME,
@@ -492,7 +622,7 @@ const Overview = new Lang.Class({
                          });
 
         Tweener.addTween(this._background,
-                         { dim_factor: 0.8,
+                         { dim_factor: 0.4,
                            time: ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });
@@ -535,6 +665,10 @@ const Overview = new Lang.Class({
 
         this._shown = false;
         this._syncInputMode();
+
+        if (this._buttonPressId > 0)
+            this._group.disconnect(this._buttonPressId);
+        this._buttonPressId = 0;
     },
 
     // hideTemporarily:
@@ -558,7 +692,7 @@ const Overview = new Lang.Class({
         if (this.isDummy)
             return;
 
-        if (this.visible)
+        if (this._shown)
             this.hide();
         else
             this.show();
@@ -575,21 +709,20 @@ const Overview = new Lang.Class({
 
         if (this._shown) {
             if (!this._modal) {
-                if (Main.pushModal(this._overview,
-                                   { keybindingMode: Main.KeybindingMode.OVERVIEW }))
+                if (Main.pushModal(this._group))
                     this._modal = true;
                 else
                     this.hide();
             }
         } else if (this._shownTemporarily) {
             if (this._modal) {
-                Main.popModal(this._overview);
+                Main.popModal(this._group);
                 this._modal = false;
             }
             global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
         } else {
             if (this._modal) {
-                Main.popModal(this._overview);
+                Main.popModal(this._group);
                 this._modal = false;
             }
             else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
@@ -607,7 +740,7 @@ const Overview = new Lang.Class({
         this._viewSelector.zoomFromOverview();
 
         // Make other elements fade out.
-        Tweener.addTween(this._overview,
+        Tweener.addTween(this._group,
                          { opacity: 0,
                            transition: 'easeOutQuad',
                            time: ANIMATION_TIME,
@@ -649,7 +782,7 @@ const Overview = new Lang.Class({
         this._viewSelector.hide();
         this._desktopFade.hide();
         this._background.hide();
-        this._overview.hide();
+        this._group.hide();
 
         this.visible = false;
         this.animationInProgress = false;

js/ui/panel.js

@@ -75,41 +75,33 @@ function _unpremultiply(color) {
                                blue: blue, alpha: color.alpha });
 };
 
-const Animation = new Lang.Class({
-    Name: 'Animation',
 
-    _init: function(filename, width, height, speed) {
-        this.actor = new St.Bin();
+const AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',
+
+    _init: function(name, size) {
+        this.actor = new St.Bin({ visible: false });
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this._speed = speed;
+        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibleNotify));
 
-        this._isLoaded = false;
-        this._isPlaying = false;
         this._timeoutId = 0;
         this._frame = 0;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
-                                                                            Lang.bind(this, this._animationsLoaded));
+        this._animations = St.TextureCache.get_default().load_sliced_image (global.datadir + '/theme/' + name, size, size);
         this.actor.set_child(this._animations);
     },
 
-    play: function() {
-        if (this._isLoaded && this._timeoutId == 0) {
-            if (this._frame == 0)
-                this._showFrame(0);
-
-            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-        }
-
-        this._isPlaying = true;
-    },
-
-    stop: function() {
+    _disconnectTimeout: function() {
         if (this._timeoutId > 0) {
             Mainloop.source_remove(this._timeoutId);
             this._timeoutId = 0;
         }
+    },
 
-        this._isPlaying = false;
+    _onVisibleNotify: function() {
+        if (this.actor.visible)
+            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
+        else
+            this._disconnectTimeout();
     },
 
     _showFrame: function(frame) {
@@ -129,24 +121,8 @@ const Animation = new Lang.Class({
         return true;
     },
 
-    _animationsLoaded: function() {
-        this._isLoaded = true;
-
-        if (this._isPlaying)
-            this.play();
-    },
-
     _onDestroy: function() {
-        this.stop();
-    }
-});
-
-const AnimatedIcon = new Lang.Class({
-    Name: 'AnimatedIcon',
-    Extends: Animation,
-
-    _init: function(name, size) {
-        this.parent(global.datadir + '/theme/' + name, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+        this._disconnectTimeout();
     }
 });
 
@@ -271,10 +247,6 @@ const AppMenuButton = new Lang.Class({
         this._container.connect('get-preferred-height', Lang.bind(this, this._getContentPreferredHeight));
         this._container.connect('allocate', Lang.bind(this, this._contentAllocate));
 
-        let textureCache = St.TextureCache.get_default();
-        textureCache.connect('icon-theme-changed',
-                             Lang.bind(this, this._onIconThemeChanged));
-
         this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
         this._iconBox.connect('style-changed',
                               Lang.bind(this, this._onIconBoxStyleChanged));
@@ -301,7 +273,6 @@ const AppMenuButton = new Lang.Class({
         this._spinner = new AnimatedIcon('process-working.svg',
                                          PANEL_ICON_SIZE);
         this._container.add_actor(this._spinner.actor);
-        this._spinner.actor.hide();
         this._spinner.actor.lower_bottom();
 
         let tracker = Shell.WindowTracker.get_default();
@@ -361,15 +332,6 @@ const AppMenuButton = new Lang.Class({
         this._updateIconBoxClip();
     },
 
-    _onIconThemeChanged: function() {
-        if (this._iconBox.child == null)
-            return;
-
-        this._iconBox.child.destroy();
-        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
-        this._iconBox.set_child(icon);
-    },
-
     _updateIconBoxClip: function() {
         let allocation = this._iconBox.allocation;
         if (this._iconBottomClip > 0)
@@ -392,7 +354,6 @@ const AppMenuButton = new Lang.Class({
                            transition: "easeOutQuad",
                            onCompleteScope: this,
                            onComplete: function() {
-                               this._spinner.stop();
                                this._spinner.actor.opacity = 255;
                                this._spinner.actor.hide();
                            }
@@ -402,7 +363,6 @@ const AppMenuButton = new Lang.Class({
     startAnimation: function() {
         this._stop = false;
         this.actor.reactive = false;
-        this._spinner.play();
         this._spinner.actor.show();
     },
 
@@ -598,18 +558,12 @@ const AppMenuButton = new Lang.Class({
                 return;
 
             menu = new PopupMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
-            menu.connect('activate', Lang.bind(this, function() {
-                let win = this._targetApp.get_windows()[0];
-                win.check_alive(global.get_current_time());
-            }));
-
         } else {
-            if (this.menu.isDummyQuitMenu)
+            if (this.menu && !(this.menu instanceof PopupMenu.RemoteMenu))
                 return;
 
             // fallback to older menu
             menu = new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.TOP, 0);
-            menu.isDummyQuitMenu = true;
             menu.addAction(_("Quit"), Lang.bind(this, function() {
                 this._targetApp.request_quit();
             }));
@@ -622,12 +576,15 @@ const AppMenuButton = new Lang.Class({
 
 Signals.addSignalMethods(AppMenuButton.prototype);
 
+// Activities button. Because everything else in the top bar is a
+// PanelMenu.Button, it simplifies some things to make this be one too.
+// We just hack it up to not actually have a menu attached to it.
 const ActivitiesButton = new Lang.Class({
     Name: 'ActivitiesButton',
     Extends: PanelMenu.Button,
 
     _init: function() {
-        this.parent(0.0, null, true);
+        this.parent(0.0);
         this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;
 
         let container = new Shell.GenericContainer();
@@ -647,27 +604,27 @@ const ActivitiesButton = new Lang.Class({
         this.hotCorner = new Layout.HotCorner();
         container.add_actor(this.hotCorner.actor);
 
+        // Hack up our menu...
+        this.menu.open = Lang.bind(this, this._onMenuOpenRequest);
+        this.menu.close = Lang.bind(this, this._onMenuCloseRequest);
+        this.menu.toggle = Lang.bind(this, this._onMenuToggleRequest);
+
         this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
         this.actor.connect_after('button-release-event', Lang.bind(this, this._onButtonRelease));
         this.actor.connect_after('key-release-event', Lang.bind(this, this._onKeyRelease));
 
         Main.overview.connect('showing', Lang.bind(this, function() {
             this.actor.add_style_pseudo_class('overview');
+            this._escapeMenuGrab();
             this.actor.add_accessible_state (Atk.StateType.CHECKED);
         }));
         Main.overview.connect('hiding', Lang.bind(this, function() {
             this.actor.remove_style_pseudo_class('overview');
+            this._escapeMenuGrab();
             this.actor.remove_accessible_state (Atk.StateType.CHECKED);
         }));
 
         this._xdndTimeOut = 0;
-
-        // Since the hot corner uses stage coordinates, Clutter won't
-        // queue relayouts for us when the panel moves. Queue a relayout
-        // when that happens.
-        Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
-            container.queue_relayout();
-        }));
     },
 
     _containerGetPreferredWidth: function(actor, forHeight, alloc) {
@@ -713,6 +670,11 @@ const ActivitiesButton = new Lang.Class({
         return DND.DragMotionResult.CONTINUE;
     },
 
+    _escapeMenuGrab: function() {
+        if (this.menu.isOpen)
+            this.menu.close();
+    },
+
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             if (!this.hotCorner.shouldToggleOverviewOnClick())
@@ -721,13 +683,33 @@ const ActivitiesButton = new Lang.Class({
         return false;
     },
 
+    _onMenuOpenRequest: function() {
+        this.menu.isOpen = true;
+        this.menu.emit('open-state-changed', true);
+    },
+
+    _onMenuCloseRequest: function() {
+        this.menu.isOpen = false;
+        this.menu.emit('open-state-changed', false);
+    },
+
+    _onMenuToggleRequest: function() {
+        this.menu.isOpen = !this.menu.isOpen;
+        this.menu.emit('open-state-changed', this.menu.isOpen);
+    },
+
     _onButtonRelease: function() {
-        Main.overview.toggle();
+        if (this.menu.isOpen) {
+            this.menu.close();
+            Main.overview.toggle();
+        }
     },
 
     _onKeyRelease: function(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
+            if (this.menu.isOpen)
+                this.menu.close();
             Main.overview.toggle();
         }
     },
@@ -751,9 +733,12 @@ const ActivitiesButton = new Lang.Class({
 const PanelCorner = new Lang.Class({
     Name: 'PanelCorner',
 
-    _init: function(side) {
+    _init: function(box, side) {
         this._side = side;
 
+        this._box = box;
+        this._box.connect('style-changed', Lang.bind(this, this._boxStyleChanged));
+
         this.actor = new St.DrawingArea({ style_class: 'panel-corner' });
         this.actor.connect('style-changed', Lang.bind(this, this._styleChanged));
         this.actor.connect('repaint', Lang.bind(this, this._repaint));
@@ -809,12 +794,12 @@ const PanelCorner = new Lang.Class({
         return children[index];
     },
 
-    setStyleParent: function(box) {
+    _boxStyleChanged: function() {
         let side = this._side;
 
-        let rtlAwareContainer = box instanceof St.BoxLayout;
+        let rtlAwareContainer = this._box instanceof St.BoxLayout;
         if (rtlAwareContainer &&
-            box.get_text_direction() == Clutter.TextDirection.RTL) {
+            this._box.get_text_direction() == Clutter.TextDirection.RTL) {
             if (this._side == St.Side.LEFT)
                 side = St.Side.RIGHT;
             else if (this._side == St.Side.RIGHT)
@@ -823,9 +808,9 @@ const PanelCorner = new Lang.Class({
 
         let button;
         if (side == St.Side.LEFT)
-            button = this._findLeftmostButton(box);
+            button = this._findLeftmostButton(this._box);
         else if (side == St.Side.RIGHT)
-            button = this._findRightmostButton(box);
+            button = this._findRightmostButton(this._box);
 
         if (button) {
             if (this._button && this._buttonStyleChangedSignalId) {
@@ -852,7 +837,7 @@ const PanelCorner = new Lang.Class({
 
             // The corner doesn't support theme transitions, so override
             // the .panel-button default
-            button.style = 'transition-duration: 0ms';
+            button.style = 'transition-duration: 0';
         }
     },
 
@@ -865,13 +850,10 @@ const PanelCorner = new Lang.Class({
         let backgroundColor = node.get_color('-panel-corner-background-color');
         let borderColor = node.get_color('-panel-corner-border-color');
 
-        let overlap = borderColor.alpha != 0;
-        let offsetY = overlap ? 0 : borderWidth;
-
         let cr = this.actor.get_context();
         cr.setOperator(Cairo.Operator.SOURCE);
 
-        cr.moveTo(0, offsetY);
+        cr.moveTo(0, 0);
         if (this._side == St.Side.LEFT)
             cr.arc(cornerRadius,
                    borderWidth + cornerRadius,
@@ -880,7 +862,7 @@ const PanelCorner = new Lang.Class({
             cr.arc(0,
                    borderWidth + cornerRadius,
                    cornerRadius, 3 * Math.PI / 2, 2 * Math.PI);
-        cr.lineTo(cornerRadius, offsetY);
+        cr.lineTo(cornerRadius, 0);
         cr.closePath();
 
         let savedPath = cr.copyPath();
@@ -890,18 +872,14 @@ const PanelCorner = new Lang.Class({
         Clutter.cairo_set_source_color(cr, over);
         cr.fill();
 
-        if (overlap) {
-            let offset = borderWidth;
-            Clutter.cairo_set_source_color(cr, backgroundColor);
+        let offset = borderWidth;
+        Clutter.cairo_set_source_color(cr, backgroundColor);
 
-            cr.save();
-            cr.translate(xOffsetDirection * offset, - offset);
-            cr.appendPath(savedPath);
-            cr.fill();
-            cr.restore();
-        }
-
-        cr.$dispose();
+        cr.save();
+        cr.translate(xOffsetDirection * offset, - offset);
+        cr.appendPath(savedPath);
+        cr.fill();
+        cr.restore();
     },
 
     _styleChanged: function() {
@@ -923,7 +901,6 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'volume': imports.ui.status.volume.Indicator,
     'battery': imports.ui.status.power.Indicator,
     'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
-    'logo': imports.gdm.loginDialog.LogoMenuButton,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
     'powerMenu': imports.gdm.powerMenu.PowerMenuButton,
     'userMenu': imports.ui.userMenu.UserMenuButton
@@ -948,10 +925,15 @@ const Panel = new Lang.Class({
                                                   reactive: true });
         this.actor._delegate = this;
 
-        this._sessionStyle = null;
-
         this.statusArea = {};
 
+        Main.overview.connect('shown', Lang.bind(this, function () {
+            this.actor.add_style_class_name('in-overview');
+        }));
+        Main.overview.connect('hiding', Lang.bind(this, function () {
+            this.actor.remove_style_class_name('in-overview');
+        }));
+
         this.menuManager = new PopupMenu.PopupMenuManager(this);
 
         this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
@@ -961,10 +943,17 @@ const Panel = new Lang.Class({
         this._rightBox = new St.BoxLayout({ name: 'panelRight' });
         this.actor.add_actor(this._rightBox);
 
-        this._leftCorner = new PanelCorner(St.Side.LEFT);
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            this._leftCorner = new PanelCorner(this._rightBox, St.Side.LEFT);
+        else
+            this._leftCorner = new PanelCorner(this._leftBox, St.Side.LEFT);
+
         this.actor.add_actor(this._leftCorner.actor);
 
-        this._rightCorner = new PanelCorner(St.Side.RIGHT);
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            this._rightCorner = new PanelCorner(this._leftBox, St.Side.RIGHT);
+        else
+            this._rightCorner = new PanelCorner(this._rightBox, St.Side.RIGHT);
         this.actor.add_actor(this._rightCorner.actor);
 
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@@ -973,7 +962,7 @@ const Panel = new Lang.Class({
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
 
         Main.layoutManager.panelBox.add(this.actor);
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'emblem-system-symbolic',
+        Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'start-here-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.TOP });
 
         Main.sessionMode.connect('updated', Lang.bind(this, this._updatePanel));
@@ -1130,20 +1119,17 @@ const Panel = new Lang.Class({
         this._updateBox(panel.left, this._leftBox);
         this._updateBox(panel.center, this._centerBox);
         this._updateBox(panel.right, this._rightBox);
+    },
 
-        if (this._sessionStyle)
-            this._removeStyleClassName(this._sessionStyle);
-
-        this._sessionStyle = Main.sessionMode.panelStyle;
-        if (this._sessionStyle)
-            this._addStyleClassName(this._sessionStyle);
-
-        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL) {
-            this._leftCorner.setStyleParent(this._rightBox);
-            this._rightCorner.setStyleParent(this._leftBox);
-        } else {
-            this._leftCorner.setStyleParent(this._leftBox);
-            this._rightCorner.setStyleParent(this._rightBox);
+    _initBox: function(elements, box) {
+        for (let i = 0; i < elements.length; i++) {
+            let role = elements[i];
+            let constructor = PANEL_ITEM_IMPLEMENTATIONS[role];
+            if (!constructor) {
+                // panel icon is not supported (can happen for
+                // bluetooth or network)
+                continue;
+            }
         }
     },
 
@@ -1221,17 +1207,5 @@ const Panel = new Lang.Class({
         this.statusArea[role] = indicator;
         this._addToPanelBox(role, indicator, position, boxContainer);
         return indicator;
-    },
-
-    _addStyleClassName: function(className) {
-        this.actor.add_style_class_name(className);
-        this._rightCorner.actor.add_style_class_name(className);
-        this._leftCorner.actor.add_style_class_name(className);
-    },
-
-    _removeStyleClassName: function(className) {
-        this.actor.remove_style_class_name(className);
-        this._rightCorner.actor.remove_style_class_name(className);
-        this._leftCorner.actor.remove_style_class_name(className);
     }
 });

js/ui/panelMenu.js

@@ -112,7 +112,7 @@ const Button = new Lang.Class({
         this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
 
         if (dontCreateMenu)
-            this.menu = new PopupMenu.PopupDummyMenu(this.actor);
+            this.menu = null;
         else
             this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
 
@@ -244,21 +244,18 @@ const SystemStatusButton = new Lang.Class({
             this.setIcon(iconName);
     },
 
-    get icons() {
-        return this._box.get_children();
-    },
-
     addIcon: function(gicon) {
         let icon = new St.Icon({ gicon: gicon,
                                  style_class: 'system-status-icon' });
         this._box.add_actor(icon);
 
-        this.emit('icons-changed');
-
         return icon;
     },
 
     setIcon: function(iconName) {
+        // Need to first add a NULL GIcon and then set icon_name, to ensure
+        // compatibility with -symbolic fallbacks
+
         if (!this.mainIcon)
             this.mainIcon = this.addIcon(null);
         this.mainIcon.icon_name = iconName;

js/ui/pointerWatcher.js

@@ -2,7 +2,6 @@
 
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Shell = imports.gi.Shell;
 
 // We stop polling if the user is idle for more than this amount of time
@@ -41,9 +40,9 @@ const PointerWatcher = new Lang.Class({
     Name: 'PointerWatcher',
 
     _init: function() {
-        let idleMonitor = new GnomeDesktop.IdleMonitor();
-        idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
-        idleMonitor.add_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
+        let idleMonitor = Shell.IdleMonitor.get();
+        idleMonitor.add_watch(IDLE_TIME,
+                              Lang.bind(this, this._onIdleMonitorWatch));
         this._idle = idleMonitor.get_idletime() > IDLE_TIME;
         this._watches = [];
         this.pointerX = null;
@@ -79,14 +78,11 @@ const PointerWatcher = new Lang.Class({
         }
     },
 
-    _onIdleMonitorBecameActive: function(monitor) {
-        this._idle = false;
-        this._updatePointer();
-        this._updateTimeout();
-    },
+    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
+        this._idle = userBecameIdle;
+        if (!userBecameIdle)
+            this._updatePointer();
 
-    _onIdleMonitorBecameIdle: function(monitor) {
-        this._idle = true;
         this._updateTimeout();
     },
 

js/ui/popupMenu.js

@@ -1,5 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
@@ -11,10 +12,8 @@ const St = imports.gi.St;
 const Atk = imports.gi.Atk;
 
 const BoxPointer = imports.ui.boxpointer;
-const GrabHelper = imports.ui.grabHelper;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Separator = imports.ui.separator;
 const Tweener = imports.ui.tweener;
 
 const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
@@ -207,7 +206,6 @@ const PopupBaseMenuItem = new Lang.Class({
             color.alpha / 255);
         cr.arc(width / 2, height / 2, width / 3, 0, 2 * Math.PI);
         cr.fill();
-        cr.$dispose();
     },
 
     // This returns column widths in logical order (i.e. from the dot
@@ -406,8 +404,29 @@ const PopupSeparatorMenuItem = new Lang.Class({
         this.parent({ reactive: false,
                       can_focus: false});
 
-        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
-        this.addActor(this._separator.actor, { span: -1, expand: true });
+        this._drawingArea = new St.DrawingArea({ style_class: 'popup-separator-menu-item' });
+        this.addActor(this._drawingArea, { span: -1, expand: true });
+        this._drawingArea.connect('repaint', Lang.bind(this, this._onRepaint));
+    },
+
+    _onRepaint: function(area) {
+        let cr = area.get_context();
+        let themeNode = area.get_theme_node();
+        let [width, height] = area.get_surface_size();
+        let margin = themeNode.get_length('-margin-horizontal');
+        let gradientHeight = themeNode.get_length('-gradient-height');
+        let startColor = themeNode.get_color('-gradient-start');
+        let endColor = themeNode.get_color('-gradient-end');
+
+        let gradientWidth = (width - margin * 2);
+        let gradientOffset = (height - gradientHeight) / 2;
+        let pattern = new Cairo.LinearGradient(margin, gradientOffset, width - margin, gradientOffset + gradientHeight);
+        pattern.addColorStopRGBA(0, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
+        pattern.addColorStopRGBA(0.5, endColor.red / 255, endColor.green / 255, endColor.blue / 255, endColor.alpha / 255);
+        pattern.addColorStopRGBA(1, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
+        cr.setSource(pattern);
+        cr.rectangle(margin, gradientOffset, gradientWidth, gradientHeight);
+        cr.fill();
     }
 });
 
@@ -605,7 +624,6 @@ const PopupSliderMenuItem = new Lang.Class({
             color.alpha / 255);
         cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI);
         cr.fill();
-        cr.$dispose();
     },
 
     _startDragging: function(actor, event) {
@@ -638,34 +656,20 @@ const PopupSliderMenuItem = new Lang.Class({
         return true;
     },
 
-    scroll: function(event) {
+    _onScrollEvent: function (actor, event) {
         let direction = event.get_scroll_direction();
-        let delta;
-
-        if (event.is_pointer_emulated())
-            return;
 
         if (direction == Clutter.ScrollDirection.DOWN) {
-            delta = -SLIDER_SCROLL_STEP;
-        } else if (direction == Clutter.ScrollDirection.UP) {
-            delta = +SLIDER_SCROLL_STEP;
-        } else if (direction == Clutter.ScrollDirection.SMOOTH) {
-            let [dx, dy] = event.get_scroll_delta();
-            // Even though the slider is horizontal, use dy to match
-            // the UP/DOWN above.
-            delta = -dy / 10;
+            this._value = Math.max(0, this._value - SLIDER_SCROLL_STEP);
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._value = Math.min(1, this._value + SLIDER_SCROLL_STEP);
         }
-
-        this._value = Math.min(Math.max(0, this._value + delta), 1);
 
         this._slider.queue_repaint();
         this.emit('value-changed', this._value);
     },
 
-    _onScrollEvent: function(actor, event) {
-        this.scroll(event);
-    },
-
     _motionEvent: function(actor, event) {
         let absX, absY;
         [absX, absY] = event.get_coords();
@@ -1200,6 +1204,7 @@ const PopupMenu = new Lang.Class({
         this.actor = this._boxPointer.actor;
         this.actor._delegate = this;
         this.actor.style_class = 'popup-menu-boxpointer';
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
 
         this._boxWrapper = new Shell.GenericContainer();
         this._boxWrapper.connect('get-preferred-width', Lang.bind(this, this._boxGetPreferredWidth));
@@ -1229,6 +1234,15 @@ const PopupMenu = new Lang.Class({
         this.box.allocate(box, flags);
     },
 
+    _onKeyPressEvent: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape) {
+            this.close(BoxPointer.PopupAnimation.FULL);
+            return true;
+        }
+
+        return false;
+    },
+
     setArrowOrigin: function(origin) {
         this._boxPointer.setArrowOrigin(origin);
     },
@@ -1269,28 +1283,6 @@ const PopupMenu = new Lang.Class({
     }
 });
 
-const PopupDummyMenu = new Lang.Class({
-    Name: 'PopupDummyMenu',
-
-    _init: function(sourceActor) {
-        this.sourceActor = sourceActor;
-        this.actor = sourceActor;
-        this.actor._delegate = this;
-    },
-
-    isChildMenu: function() {
-        return false;
-    },
-
-    open: function() { this.emit('open-state-changed', true); },
-    close: function() { this.emit('open-state-changed', false); },
-    toggle: function() {},
-    destroy: function() {
-        this.emit('destroy');
-    },
-});
-Signals.addSignalMethods(PopupDummyMenu.prototype);
-
 const PopupSubMenu = new Lang.Class({
     Name: 'PopupSubMenu',
     Extends: PopupMenuBase,
@@ -1545,6 +1537,7 @@ const PopupComboMenu = new Lang.Class({
 
         this.actor = this.box;
         this.actor._delegate = this;
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
         this.actor.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
         sourceActor.connect('style-changed',
                             Lang.bind(this, this._onSourceActorStyleChanged));
@@ -1552,6 +1545,15 @@ const PopupComboMenu = new Lang.Class({
         global.focus_manager.add_group(this.actor);
     },
 
+    _onKeyPressEvent: function(actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape) {
+            this.close(BoxPointer.PopupAnimation.FULL);
+            return true;
+        }
+
+        return false;
+    },
+
     _onKeyFocusIn: function(actor) {
         let items = this._getMenuItems();
         let activeItem = items[this._activeItemPos];
@@ -2042,8 +2044,17 @@ const PopupMenuManager = new Lang.Class({
 
     _init: function(owner) {
         this._owner = owner;
-        this._grabHelper = new GrabHelper.GrabHelper(owner.actor);
+        this.grabbed = false;
+
+        this._eventCaptureId = 0;
+        this._enterEventId = 0;
+        this._leaveEventId = 0;
+        this._keyFocusNotifyId = 0;
+        this._activeMenu = null;
         this._menus = [];
+        this._menuStack = [];
+        this._preGrabInputMode = null;
+        this._grabbedFromKeynav = false;
     },
 
     addMenu: function(menu, position) {
@@ -2062,8 +2073,6 @@ const PopupMenuManager = new Lang.Class({
 
         let source = menu.sourceActor;
         if (source) {
-            if (!menu.blockSourceEvents)
-                this._grabHelper.addActor(source);
             menudata.enterId = source.connect('enter-event', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
             menudata.focusInId = source.connect('key-focus-in', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
         }
@@ -2076,7 +2085,7 @@ const PopupMenuManager = new Lang.Class({
 
     removeMenu: function(menu) {
         if (menu == this._activeMenu)
-            this._closeMenu(menu);
+            this._closeMenu();
 
         let position = this._findMenu(menu);
         if (position == -1) // not a menu we manage
@@ -2093,29 +2102,79 @@ const PopupMenuManager = new Lang.Class({
         if (menudata.focusInId)
             menu.sourceActor.disconnect(menudata.focusInId);
 
-        if (menu.sourceActor)
-            this._grabHelper.removeActor(menu.sourceActor);
         this._menus.splice(position, 1);
     },
 
-    get activeMenu() {
-        let actor = this._grabHelper.currentGrab.actor;
-        if (actor)
-            return actor._delegate;
-        else
-            return null;
+    _grab: function() {
+        Main.pushModal(this._owner.actor);
+
+        this._eventCaptureId = global.stage.connect('captured-event', Lang.bind(this, this._onEventCapture));
+        // captured-event doesn't see enter/leave events
+        this._enterEventId = global.stage.connect('enter-event', Lang.bind(this, this._onEventCapture));
+        this._leaveEventId = global.stage.connect('leave-event', Lang.bind(this, this._onEventCapture));
+        this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
+
+        this.grabbed = true;
     },
 
-    ignoreRelease: function() {
-        return this._grabHelper.ignoreRelease();
+    _ungrab: function() {
+        global.stage.disconnect(this._eventCaptureId);
+        this._eventCaptureId = 0;
+        global.stage.disconnect(this._enterEventId);
+        this._enterEventId = 0;
+        global.stage.disconnect(this._leaveEventId);
+        this._leaveEventId = 0;
+        global.stage.disconnect(this._keyFocusNotifyId);
+        this._keyFocusNotifyId = 0;
+
+        this.grabbed = false;
+        Main.popModal(this._owner.actor);
     },
 
     _onMenuOpenState: function(menu, open) {
         if (open) {
-            this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
-                                    onUngrab: Lang.bind(this, this._closeMenu, menu) });
+            if (this._activeMenu && this._activeMenu.isChildMenu(menu)) {
+                this._menuStack.push(this._activeMenu);
+                menu.actor.grab_key_focus();
+            }
+            this._activeMenu = menu;
         } else {
-            this._grabHelper.ungrab({ actor: menu.actor });
+            if (this._menuStack.length > 0) {
+                this._activeMenu = this._menuStack.pop();
+                if (menu.sourceActor)
+                    menu.sourceActor.grab_key_focus();
+                this._didPop = true;
+            }
+        }
+
+        // Check what the focus was before calling pushModal/popModal
+        let focus = global.stage.key_focus;
+        let hadFocus = focus && this._activeMenuContains(focus);
+
+        if (open) {
+            if (!this.grabbed) {
+                this._preGrabInputMode = global.stage_input_mode;
+                this._grabbedFromKeynav = hadFocus;
+                this._grab();
+            }
+
+            if (hadFocus)
+                focus.grab_key_focus();
+            else
+                menu.actor.grab_key_focus();
+        } else if (menu == this._activeMenu) {
+            if (this.grabbed)
+                this._ungrab();
+            this._activeMenu = null;
+
+            if (this._grabbedFromKeynav) {
+                if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED)
+                    global.stage_input_mode = Shell.StageInputMode.FOCUSED;
+                if (hadFocus && menu.sourceActor)
+                    menu.sourceActor.grab_key_focus();
+                else if (focus)
+                    focus.grab_key_focus();
+            }
         }
     },
 
@@ -2127,38 +2186,87 @@ const PopupMenuManager = new Lang.Class({
         this.removeMenu(childMenu);
     },
 
+    // change the currently-open menu without dropping grab
     _changeMenu: function(newMenu) {
-        let oldMenu = this.activeMenu;
-        if (oldMenu) {
+        if (this._activeMenu) {
+            // _onOpenMenuState will drop the grab if it sees
+            // this._activeMenu being closed; so clear _activeMenu
+            // before closing it to keep that from happening
+            let oldMenu = this._activeMenu;
+            this._activeMenu = null;
+            for (let i = this._menuStack.length - 1; i >= 0; i--)
+                this._menuStack[i].close(BoxPointer.PopupAnimation.FADE);
             oldMenu.close(BoxPointer.PopupAnimation.FADE);
             newMenu.open(BoxPointer.PopupAnimation.FADE);
-        } else {
+        } else
             newMenu.open(BoxPointer.PopupAnimation.FULL);
-        }
     },
 
     _onMenuSourceEnter: function(menu) {
-        if (!this._grabHelper.grabbed)
+        if (!this.grabbed || menu == this._activeMenu)
             return false;
 
-        if (this._grabHelper.isActorGrabbed(menu.actor))
+        if (this._activeMenu && this._activeMenu.isChildMenu(menu))
             return false;
 
-        let isChildMenu = this._grabHelper.grabStack.some(function(grab) {
-            let existingMenu = grab.actor._delegate;
-            return existingMenu.isChildMenu(menu);
-        });
-        if (isChildMenu)
+        if (this._menuStack.indexOf(menu) != -1)
+            return false;
+
+        if (this._menuStack.length > 0 && this._menuStack[0].isChildMenu(menu))
             return false;
 
         this._changeMenu(menu);
         return false;
     },
 
+    _onKeyFocusChanged: function() {
+        if (!this.grabbed || !this._activeMenu)
+            return;
+
+        let focus = global.stage.key_focus;
+        if (focus) {
+            if (this._activeMenuContains(focus))
+                return;
+            if (this._menuStack.length > 0)
+                return;
+            if (focus._delegate && focus._delegate.menu &&
+                this._findMenu(focus._delegate.menu) != -1)
+                return;
+        }
+
+        this._closeMenu();
+    },
+
     _onMenuDestroy: function(menu) {
         this.removeMenu(menu);
     },
 
+    _activeMenuContains: function(actor) {
+        return this._activeMenu != null
+                && (this._activeMenu.actor.contains(actor) ||
+                    (this._activeMenu.sourceActor && this._activeMenu.sourceActor.contains(actor)));
+    },
+
+    _eventIsOnActiveMenu: function(event) {
+        return this._activeMenuContains(event.get_source());
+    },
+
+    _shouldBlockEvent: function(event) {
+        let src = event.get_source();
+
+        if (this._activeMenu != null && this._activeMenu.actor.contains(src))
+            return false;
+
+        for (let i = 0; i < this._menus.length; i++) {
+            let menu = this._menus[i].menu;
+            if (menu.sourceActor && !menu.blockSourceEvents && menu.sourceActor.contains(src)) {
+                return false;
+            }
+        }
+
+        return true;
+    },
+
     _findMenu: function(item) {
         for (let i = 0; i < this._menus.length; i++) {
             let menudata = this._menus[i];
@@ -2168,11 +2276,41 @@ const PopupMenuManager = new Lang.Class({
         return -1;
     },
 
-    _closeMenu: function(isUser, menu) {
-        // If this isn't a user action, we called close()
-        // on the BoxPointer ourselves, so we shouldn't
-        // reanimate.
-        if (isUser)
-            menu.close(BoxPointer.PopupAnimation.FULL);
+    _onEventCapture: function(actor, event) {
+        if (!this.grabbed)
+            return false;
+
+        if (this._owner.menuEventFilter &&
+            this._owner.menuEventFilter(event))
+            return true;
+
+        if (this._didPop) {
+            this._didPop = false;
+            return true;
+        }
+
+        let activeMenuContains = this._eventIsOnActiveMenu(event);
+        let eventType = event.type();
+
+        if (eventType == Clutter.EventType.BUTTON_RELEASE) {
+            if (activeMenuContains) {
+                return false;
+            } else {
+                this._closeMenu();
+                return true;
+            }
+        } else if (eventType == Clutter.EventType.BUTTON_PRESS && !activeMenuContains) {
+            this._closeMenu();
+            return true;
+        } else if (!this._shouldBlockEvent(event)) {
+            return false;
+        }
+
+        return true;
+    },
+
+    _closeMenu: function() {
+        if (this._activeMenu != null)
+            this._activeMenu.close(BoxPointer.PopupAnimation.FULL);
     }
 });

js/ui/remoteSearch.js

@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const FileUtils = imports.misc.fileUtils;
 const Search = imports.ui.search;
@@ -31,175 +29,105 @@ const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">
 </method>
 </interface>;
 
-const SearchProvider2Iface = <interface name="org.gnome.Shell.SearchProvider2">
-<method name="GetInitialResultSet">
-    <arg type="as" direction="in" />
-    <arg type="as" direction="out" />
-</method>
-<method name="GetSubsearchResultSet">
-    <arg type="as" direction="in" />
-    <arg type="as" direction="in" />
-    <arg type="as" direction="out" />
-</method>
-<method name="GetResultMetas">
-    <arg type="as" direction="in" />
-    <arg type="aa{sv}" direction="out" />
-</method>
-<method name="ActivateResult">
-    <arg type="s" direction="in" />
-    <arg type="as" direction="in" />
-    <arg type="u" direction="in" />
-</method>
-<method name="LaunchSearch">
-    <arg type="as" direction="in" />
-    <arg type="u" direction="in" />
-</method>
-</interface>;
-
 var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
-var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface);
+
 
 function loadRemoteSearchProviders(addProviderCallback) {
-    let data = { loadedProviders: [],
-                 objectPaths: {},
-                 addProviderCallback: addProviderCallback };
-    FileUtils.collectFromDatadirsAsync('search-providers',
-                                       { loadedCallback: remoteProvidersLoaded,
-                                         processFile: loadRemoteSearchProvider,
-                                         data: data
-                                       });
-}
-
-function loadRemoteSearchProvider(file, info, data) {
-    let keyfile = new GLib.KeyFile();
-    let path = file.get_path();
-
-    try {
-        keyfile.load_from_file(path, 0);
-    } catch(e) {
-        return;
+    let dataDirs = GLib.get_system_data_dirs();
+    let loadedProviders = {};
+    for (let i = 0; i < dataDirs.length; i++) {
+        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'search-providers']);
+        let dir = Gio.file_new_for_path(path);
+        if (!dir.query_exists(null))
+            continue;
+        loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback);
     }
+};
 
-    if (!keyfile.has_group(KEY_FILE_GROUP))
-        return;
+function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback) {
+    let dirPath = dir.get_path();
+    FileUtils.listDirAsync(dir, Lang.bind(this, function(files) {
+        for (let i = 0; i < files.length; i++) {
+            let keyfile = new GLib.KeyFile();
+            let path = GLib.build_filenamev([dirPath, files[i].get_name()]);
 
-    let remoteProvider;
-    try {
-        let group = KEY_FILE_GROUP;
-        let busName = keyfile.get_string(group, 'BusName');
-        let objectPath = keyfile.get_string(group, 'ObjectPath');
-
-        if (data.objectPaths[objectPath])
-            return;
-
-        let appInfo = null;
-        try {
-            let desktopId = keyfile.get_string(group, 'DesktopId');
-            appInfo = Gio.DesktopAppInfo.new(desktopId);
-        } catch (e) {
-            log('Ignoring search provider ' + path + ': missing DesktopId');
-            return;
-        }
-
-        let version = '1';
-        try {
-            version = keyfile.get_string(group, 'Version');
-        } catch (e) {
-            // ignore error
-        }
-
-        if (version >= 2)
-            remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
-        else
-            remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
-
-        data.objectPaths[objectPath] = remoteProvider;
-        data.loadedProviders.push(remoteProvider);
-    } catch(e) {
-        log('Failed to add search provider %s: %s'.format(path, e.toString()));
-    }
-}
-
-function remoteProvidersLoaded(loadState) {
-    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-    let sortOrder = searchSettings.get_strv('sort-order');
-    let numSorted = sortOrder.length;
-
-    loadState.loadedProviders.sort(
-        function(providerA, providerB) {
-            let idxA, idxB;
-            let appIdA, appIdB;
-
-            appIdA = providerA.appInfo.get_id();
-            appIdB = providerB.appInfo.get_id();
-
-            idxA = sortOrder.indexOf(appIdA);
-            idxB = sortOrder.indexOf(appIdB);
-
-            // if no provider is found in the order, use alphabetical order
-            if ((idxA == -1) && (idxB == -1))
-                return GLib.utf8_collate(providerA.title, providerB.title);
-
-            if (numSorted > 1) {
-                // if providerA is the last, it goes after everything
-                if ((idxA + 1) == numSorted)
-                    return 1;
-                // if providerB is the last, it goes after everything
-                else if ((idxB + 1) == numSorted)
-                    return -1;
+            try {
+                keyfile.load_from_file(path, 0);
+            } catch(e) {
+                continue;
             }
 
-            // if providerA isn't found, it's sorted after providerB
-            if (idxA == -1)
-                return 1;
+            if (!keyfile.has_group(KEY_FILE_GROUP))
+                continue;
 
-            // if providerB isn't found, it's sorted after providerA
-            if (idxB == -1)
-                return -1;
+            let remoteProvider, title;
+            try {
+                let group = KEY_FILE_GROUP;
+                let busName = keyfile.get_string(group, 'BusName');
+                let objectPath = keyfile.get_string(group, 'ObjectPath');
 
-            // finally, if both providers are found, return their order in the list
-            return (idxA - idxB);
-        });
+                if (loadedProviders[objectPath])
+                    continue;
 
-    loadState.loadedProviders.forEach(
-        function(provider) {
-            loadState.addProviderCallback(provider);
-        });
-}
+                let appInfo = null;
+                try {
+                    let desktopId = keyfile.get_string(group, 'DesktopId');
+                    appInfo = Gio.DesktopAppInfo.new(desktopId);
+                } catch (e) {
+                }
+
+                let icon;
+                if (appInfo) {
+                    icon = appInfo.get_icon();
+                    title = appInfo.get_name();
+                } else {
+                    let iconName = keyfile.get_string(group, 'Icon');
+                    icon = new Gio.ThemedIcon({ name: iconName });
+                    title = keyfile.get_locale_string(group, 'Title', null);
+                }
+
+                remoteProvider = new RemoteSearchProvider(title,
+                                                          icon,
+                                                          busName,
+                                                          objectPath);
+                loadedProviders[objectPath] = remoteProvider;
+            } catch(e) {
+                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
+                continue;
+            }
+
+            addProviderCallback(remoteProvider);
+        }
+    }));
+
+};
 
 const RemoteSearchProvider = new Lang.Class({
     Name: 'RemoteSearchProvider',
+    Extends: Search.SearchProvider,
 
-    _init: function(appInfo, dbusName, dbusPath, proxyType) {
-        if (!proxyType)
-            proxyType = SearchProviderProxy;
-
-        this.proxy = new proxyType(Gio.DBus.session,
-                dbusName, dbusPath, Lang.bind(this, this._onProxyConstructed));
-
-        this.appInfo = appInfo;
-        this.id = appInfo.get_id();
-        this.isRemoteProvider = true;
+    _init: function(title, icon, dbusName, dbusPath) {
+        this._proxy = new SearchProviderProxy(Gio.DBus.session,
+                                              dbusName, dbusPath);
 
+        this.parent(title.toUpperCase());
         this._cancellable = new Gio.Cancellable();
     },
 
-    _onProxyConstructed: function(proxy) {
-        // Do nothing
-    },
-
     createIcon: function(size, meta) {
-        let gicon;
         if (meta['gicon']) {
-            gicon = Gio.icon_new_for_string(meta['gicon']);
+            return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),
+                                 icon_size: size });
         } else if (meta['icon-data']) {
             let [width, height, rowStride, hasAlpha,
                  bitsPerSample, nChannels, data] = meta['icon-data'];
-            gicon = Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
-                                                       bitsPerSample, width, height, rowStride);
+            let textureCache = St.TextureCache.get_default();
+            return textureCache.load_from_raw(data, hasAlpha,
+                                              width, height, rowStride, size);
         }
 
-        return new St.Icon({ gicon: gicon,
+        // Ugh, but we want to fall back to something ...
+        return new St.Icon({ icon_name: 'text-x-generic',
                              icon_size: size });
     },
 
@@ -213,9 +141,9 @@ const RemoteSearchProvider = new Lang.Class({
         this._cancellable.cancel();
         this._cancellable.reset();
         try {
-            this.proxy.GetInitialResultSetRemote(terms,
-                                                 Lang.bind(this, this._getResultsFinished),
-                                                 this._cancellable);
+            this._proxy.GetInitialResultSetRemote(terms,
+                                                  Lang.bind(this, this._getResultsFinished),
+                                                  this._cancellable);
         } catch(e) {
             log('Error calling GetInitialResultSet for provider %s: %s'.format( this.title, e.toString()));
             this.searchSystem.pushResults(this, []);
@@ -226,9 +154,9 @@ const RemoteSearchProvider = new Lang.Class({
         this._cancellable.cancel();
         this._cancellable.reset();
         try {
-            this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
-                                                   Lang.bind(this, this._getResultsFinished),
-                                                   this._cancellable);
+            this._proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
+                                                    Lang.bind(this, this._getResultsFinished),
+                                                    this._cancellable);
         } catch(e) {
             log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.title, e.toString()));
             this.searchSystem.pushResults(this, []);
@@ -257,9 +185,9 @@ const RemoteSearchProvider = new Lang.Class({
         this._cancellable.cancel();
         this._cancellable.reset();
         try {
-            this.proxy.GetResultMetasRemote(ids,
-                                            Lang.bind(this, this._getResultMetasFinished, callback),
-                                            this._cancellable);
+            this._proxy.GetResultMetasRemote(ids,
+                                             Lang.bind(this, this._getResultMetasFinished, callback),
+                                             this._cancellable);
         } catch(e) {
             log('Error calling GetResultMetas for provider %s: %s'.format(this.title, e.toString()));
             callback([]);
@@ -267,32 +195,8 @@ const RemoteSearchProvider = new Lang.Class({
     },
 
     activateResult: function(id) {
-        this.proxy.ActivateResultRemote(id);
-    },
-
-    launchSearch: function(terms) {
-        // the provider is not compatible with the new version of the interface, launch
-        // the app itself but warn so we can catch the error in logs
-        log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
-        this.appInfo.launch([], global.create_app_launch_context());
+        this._proxy.ActivateResultRemote(id);
     }
 });
 
-const RemoteSearchProvider2 = new Lang.Class({
-    Name: 'RemoteSearchProvider2',
-    Extends: RemoteSearchProvider,
 
-    _init: function(appInfo, dbusName, dbusPath) {
-        this.parent(appInfo, dbusName, dbusPath, SearchProvider2Proxy);
-
-        this.canLaunchSearch = true;
-    },
-
-    activateResult: function(id, terms) {
-        this.proxy.ActivateResultRemote(id, terms, global.get_current_time());
-    },
-
-    launchSearch: function(terms) {
-        this.proxy.LaunchSearchRemote(terms, global.get_current_time());
-    }
-});

js/ui/runDialog.js

@@ -202,12 +202,11 @@ const RunDialog = new Lang.Class({
 
 
         let label = new St.Label({ style_class: 'run-dialog-label',
-                                   text: _("Enter a Command") });
+                                   text: _("Please enter a command:") });
 
         this.contentLayout.add(label, { y_align: St.Align.START });
 
-        let entry = new St.Entry({ style_class: 'run-dialog-entry',
-                                   can_focus: true });
+        let entry = new St.Entry({ style_class: 'run-dialog-entry' });
         ShellEntry.addContextMenu(entry);
 
         entry.label_actor = label;
@@ -237,10 +236,6 @@ const RunDialog = new Lang.Class({
 
         this._errorBox.hide();
 
-        this.setButtons([{ action: Lang.bind(this, this.close),
-                           label: _("Close"),
-                           key: Clutter.Escape }]);
-
         this._pathCompleter = new Gio.FilenameCompleter();
         this._commandCompleter = new CommandCompleter();
         this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
@@ -251,12 +246,20 @@ const RunDialog = new Lang.Class({
             let symbol = e.get_key_symbol();
             if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
                 this.popModal();
-                this._run(o.get_text(),
-                          e.get_state() & Clutter.ModifierType.CONTROL_MASK);
-                if (!this._commandError ||
-                    !this.pushModal())
+                if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
+                    this._run(o.get_text(), true);
+                else
+                    this._run(o.get_text(), false);
+                if (!this._commandError)
                     this.close();
-
+                else {
+                    if (!this.pushModal())
+                        this.close();
+                }
+                return true;
+            }
+            if (symbol == Clutter.Escape) {
+                this.close();
                 return true;
             }
             if (symbol == Clutter.slash) {

js/ui/screenShield.js

@@ -9,6 +9,7 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const TweenerEquations = imports.tweener.equations;
 
@@ -25,7 +26,6 @@ const Util = imports.misc.util;
 
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
-const LOCK_DELAY_KEY = 'lock-delay';
 
 const CURTAIN_SLIDE_TIME = 0.3;
 // fraction of screen height the arrow must reach before completing
@@ -50,38 +50,6 @@ const SUMMARY_ICON_SIZE = 48;
 const STANDARD_FADE_TIME = 10;
 const SHORT_FADE_TIME = 0.3;
 
-function sample(offx, offy) {
-    return 'texel += texture2D (sampler, tex_coord.st + pixel_step * ' +
-        'vec2 (' + offx + ',' + offy + '));\n'
-}
-const GLSL_BLUR_EFFECT_DECLARATIONS = ' \
-uniform vec2 pixel_step;\n \
-uniform float desaturation;\n \
-vec4 apply_blur(in sampler2D sampler, in vec2 tex_coord) {\n \
-  vec4 texel;\n \
-  texel = texture2D (sampler, tex_coord.st);\n'
-  + sample(-1.0, -1.0)
-  + sample( 0.0, -1.0)
-  + sample(+1.0, -1.0)
-  + sample(-1.0,  0.0)
-  + sample(+1.0,  0.0)
-  + sample(-1.0, +1.0)
-  + sample( 0.0, +1.0)
-  + sample(+1.0, +1.0) + ' \
-   texel /= 9.0;\n \
-   return texel;\n \
-}\n \
-vec3 desaturate (const vec3 color)\n \
-{\n \
-   const vec3 gray_conv = vec3 (0.299, 0.587, 0.114);\n \
-   vec3 gray = vec3 (dot (gray_conv, color));\n \
-   return vec3 (mix (color.rgb, gray, desaturation));\n \
-}';
-const GLSL_BLUR_EFFECT_CODE = ' \
-cogl_texel = apply_blur(cogl_sampler, cogl_tex_coord.st);\n \
-cogl_texel.rgb = desaturate(cogl_texel.rgb);\n';
-
-
 const Clock = new Lang.Class({
     Name: 'ScreenShieldClock',
 
@@ -309,7 +277,6 @@ const NotificationsBox = new Lang.Class({
         obj.item.disconnect(obj.contentUpdatedId);
         obj.source.disconnect(obj.sourceDestroyId);
         obj.source.disconnect(obj.sourceCountChangedId);
-        obj.source.disconnect(obj.sourceTitleChangedId);
     },
 });
 
@@ -369,10 +336,6 @@ const Arrow = new Lang.Class({
     }
 });
 
-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 /**
  * To test screen shield, make sure to kill gnome-screensaver.
  *
@@ -400,25 +363,13 @@ const ScreenShield = new Lang.Class({
                                       Lang.bind(this, this._onLockScreenKeyRelease));
         this._lockScreenGroup.connect('scroll-event',
                                       Lang.bind(this, this._onLockScreenScroll));
-        Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
 
         this._lockScreenContents = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                                    name: 'lockScreenContents' });
         this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));
 
-        let backgroundActor = Meta.BackgroundActor.new_for_screen(global.screen);
-        backgroundActor.add_glsl_snippet(Meta.SnippetHook.TEXTURE_LOOKUP,
-                                         GLSL_BLUR_EFFECT_DECLARATIONS,
-                                         GLSL_BLUR_EFFECT_CODE,
-                                         true);
-        backgroundActor.set_uniform_float('desaturation',
-                                          1, 1, [0.6]);
-        backgroundActor.connect('notify::size', function(actor) {
-            actor.set_uniform_float('pixel_step', 2, 1, [1/actor.width, 1/actor.height]);
-        });
-
         this._background = new St.Bin({ style_class: 'screen-shield-background',
-                                        child: backgroundActor });
+                                        child: Meta.BackgroundActor.new_for_screen(global.screen) });
         this._lockScreenGroup.add_actor(this._background);
         this._lockScreenGroup.add_actor(this._lockScreenContents);
 
@@ -437,11 +388,14 @@ const ScreenShield = new Lang.Class({
         }
         this._lockScreenContents.add_actor(this._arrowContainer);
 
-        this._dragAction = new Clutter.GestureAction();
-        this._dragAction.connect('gesture-begin', Lang.bind(this, this._onDragBegin));
-        this._dragAction.connect('gesture-progress', Lang.bind(this, this._onDragMotion));
-        this._dragAction.connect('gesture-end', Lang.bind(this, this._onDragEnd));
-        this._lockScreenGroup.add_action(this._dragAction);
+        let dragArea = new Clutter.Rect({ origin: new Clutter.Point({ x: 0, y: -global.screen_height, }),
+                                          size: new Clutter.Size({ width: global.screen_width,
+                                                                   height: global.screen_height }) });
+        let action = new Clutter.DragAction({ drag_axis: Clutter.DragAxis.Y_AXIS,
+                                              drag_area: dragArea });
+        action.connect('drag-begin', Lang.bind(this, this._onDragBegin));
+        action.connect('drag-end', Lang.bind(this, this._onDragEnd));
+        this._lockScreenGroup.add_action(action);
 
         this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                 y_expand: true,
@@ -484,7 +438,7 @@ const ScreenShield = new Lang.Class({
                                                  fadeInTime: STANDARD_FADE_TIME,
                                                  fadeFactor: 1 });
 
-        this.idleMonitor = new GnomeDesktop.IdleMonitor();
+        this.idleMonitor = Shell.IdleMonitor.get();
     },
 
     _onLockScreenKeyRelease: function(actor, event) {
@@ -504,8 +458,8 @@ const ScreenShield = new Lang.Class({
         if (symbol == Clutter.KEY_Escape ||
             symbol == Clutter.KEY_Return ||
             symbol == Clutter.KEY_KP_Enter) {
-            this._ensureUnlockDialog(true, true);
-            this._hideLockScreen(true, 0);
+            this._ensureUnlockDialog(true);
+            this._hideLockScreen(true);
             return true;
         }
 
@@ -527,8 +481,8 @@ const ScreenShield = new Lang.Class({
 
         // 7 standard scrolls to lift up
         if (this._lockScreenScrollCounter > 35) {
-            this._ensureUnlockDialog(false, true);
-            this._hideLockScreen(true, 0);
+            this._ensureUnlockDialog(false);
+            this._hideLockScreen(true);
         }
 
         return true;
@@ -559,29 +513,13 @@ const ScreenShield = new Lang.Class({
     _onDragBegin: function() {
         Tweener.removeTweens(this._lockScreenGroup);
         this._lockScreenState = MessageTray.State.HIDING;
-        this._ensureUnlockDialog(false, false);
-
-        return true;
-    },
-
-    _onDragMotion: function() {
-	let [origX, origY] = this._dragAction.get_press_coords(0);
-	let [currentX, currentY] = this._dragAction.get_motion_coords(0);
-
-	let newY = currentY - origY;
-	newY = clamp(newY, -global.stage.height, 0);
-
-	this._lockScreenGroup.y = newY;
-
-	return true;
+        this._ensureUnlockDialog(false);
     },
 
     _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
         if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
-	    let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);
-	    this._hideLockScreen(true, -velocityY);
-            this._ensureUnlockDialog(false, true);
+            this._hideLockScreen(true);
         } else {
             // restore the lock screen to its original place
             // try to use the same speed as the normal animation
@@ -621,7 +559,7 @@ const ScreenShield = new Lang.Class({
         }
 
         if (!this._isModal) {
-            Main.pushModal(this.actor, { keybindingMode: Main.KeybindingMode.LOCK_SCREEN });
+            Main.pushModal(this.actor);
             this._isModal = true;
         }
 
@@ -631,17 +569,19 @@ const ScreenShield = new Lang.Class({
             if (this._activationTime == 0)
                 this._activationTime = GLib.get_monotonic_time();
 
-            this._becameActiveId = this.idleMonitor.connect('became-active', Lang.bind(this, function() {
-                this.idleMonitor.disconnect(this._becameActiveId);
+            // What we want is a negative transition to 0, so we install a watch for
+            // 1 second and trigger it if the idle_time becomes lower than that
+            // The correct fix will come in GNOME 3.8 with GnomeDesktop.IdleMonitor
+            this._becameActiveId = this.idleMonitor.add_watch(1000, Lang.bind(this, function() {
+                if (this.idleMonitor.get_idletime() >= 1000)
+                    return;
+
+                this.idleMonitor.remove_watch(this._becameActiveId);
 
                 let lightboxWasShown = this._lightbox.shown;
                 this._lightbox.hide();
 
-                // GLib.get_monotonic_time() returns microseconds, convert to seconds
-                let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000;
-                let shouldLock = lightboxWasShown &&
-                    this._settings.get_boolean(LOCK_ENABLED_KEY) &&
-                    (elapsedTime >= this._settings.get_uint(LOCK_DELAY_KEY));
+                let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
                 if (shouldLock || this._isLocked) {
                     this.lock(false);
                 } else if (this._isActive) {
@@ -668,8 +608,8 @@ const ScreenShield = new Lang.Class({
 
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;
-        this._ensureUnlockDialog(true, true);
-        this._hideLockScreen(false, 0);
+        this._ensureUnlockDialog(true);
+        this._hideLockScreen(false);
     },
 
     _bumpLockScreen: function() {
@@ -687,21 +627,14 @@ const ScreenShield = new Lang.Class({
                          });
     },
 
-    _hideLockScreen: function(animate, velocity) {
+    _hideLockScreen: function(animate) {
         this._lockScreenState = MessageTray.State.HIDING;
 
         if (animate) {
             // Tween the lock screen out of screen
-            // if velocity is not specified (i.e. we come here from pressing ESC),
-            // use the same speed regardless of original position
-            // if velocity is specified, it's in pixels per milliseconds
+            // try to use the same speed regardless of original position
             let h = global.stage.height;
-            let delta = (h + this._lockScreenGroup.y);
-            let min_velocity = global.stage.height / (CURTAIN_SLIDE_TIME * 1000);
-
-            velocity = Math.max(min_velocity, velocity);
-            let time = (delta / velocity) / 1000;
-
+            let time = CURTAIN_SLIDE_TIME * (h + this._lockScreenGroup.y) / h;
             Tweener.removeTweens(this._lockScreenGroup);
             Tweener.addTween(this._lockScreenGroup,
                              { y: -h,
@@ -718,13 +651,11 @@ const ScreenShield = new Lang.Class({
             this._lockScreenGroup.hide();
         }
 
-        global.stage.show_cursor();
-
         if (Main.sessionMode.currentMode == 'lock-screen')
             Main.sessionMode.popMode('lock-screen');
     },
 
-    _ensureUnlockDialog: function(onPrimary, allowCancel) {
+    _ensureUnlockDialog: function(onPrimary) {
         if (!this._dialog) {
             let constructor = Main.sessionMode.unlockDialog;
             if (!constructor) {
@@ -747,8 +678,6 @@ const ScreenShield = new Lang.Class({
             this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
             this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
         }
-
-        this._dialog.allowCancel = allowCancel;
     },
 
     _onUnlockFailed: function() {
@@ -760,10 +689,6 @@ const ScreenShield = new Lang.Class({
     },
 
     _resetLockScreen: function(animateLockScreen, animateLockDialog) {
-        if (this._lockScreenState == MessageTray.State.SHOWING ||
-            this._lockScreenState == MessageTray.State.SHOWN)
-            return;
-
         this._ensureLockScreen();
         this._lockDialogGroup.scale_x = 1;
         this._lockDialogGroup.scale_y = 1;
@@ -816,16 +741,6 @@ const ScreenShield = new Lang.Class({
         this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
         this._animateArrows();
 
-        let motionId = global.stage.connect('captured-event', function(stage, event) {
-            if (event.type() == Clutter.EventType.MOTION) {
-                global.stage.show_cursor();
-                global.stage.disconnect(motionId);
-            }
-
-            return false;
-        });
-        global.stage.hide_cursor();
-
         this._lockScreenState = MessageTray.State.SHOWN;
         this._lockScreenGroup.fixed_position_set = false;
         this._lockScreenScrollCounter = 0;
@@ -940,7 +855,7 @@ const ScreenShield = new Lang.Class({
 
     lock: function(animate) {
         if (!this._isModal) {
-            Main.pushModal(this.actor, { keybindingMode: Main.KeybindingMode.LOCK_SCREEN });
+            Main.pushModal(this.actor);
             this._isModal = true;
         }
 

js/ui/screenshot.js

@@ -1,272 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const ScreenshotIface = <interface name="org.gnome.Shell.Screenshot">
-<method name="ScreenshotArea">
-    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="width"/>
-    <arg type="i" direction="in" name="height"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="ScreenshotWindow">
-    <arg type="b" direction="in" name="include_frame"/>
-    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="Screenshot">
-    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="b" direction="in" name="flash"/>
-    <arg type="s" direction="in" name="filename"/>
-    <arg type="b" direction="out" name="success"/>
-    <arg type="s" direction="out" name="filename_used"/>
-</method>
-<method name="SelectArea">
-    <arg type="i" direction="out" name="x"/>
-    <arg type="i" direction="out" name="y"/>
-    <arg type="i" direction="out" name="width"/>
-    <arg type="i" direction="out" name="height"/>
-</method>
-<method name="FlashArea">
-    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="width"/>
-    <arg type="i" direction="in" name="height"/>
-</method>
-</interface>;
-
-const ScreenshotService = new Lang.Class({
-    Name: 'ScreenshotService',
-
-    _init: function() {
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenshotIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screenshot');
-
-        Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
-    },
-
-    _onScreenshotComplete: function(obj, result, area, filenameUsed, flash, invocation) {
-        if (flash && result) {
-            let flashspot = new Flashspot(area);
-            flashspot.fire();
-        }
-
-        let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
-        invocation.return_value(retval);
-    },
-
-    ScreenshotAreaAsync : function (params, invocation) {
-        let [x, y, width, height, flash, filename, callback] = params;
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot_area (x, y, width, height, filename,
-                                Lang.bind(this, this._onScreenshotComplete,
-                                          flash, invocation));
-    },
-
-    ScreenshotWindowAsync : function (params, invocation) {
-        let [include_frame, include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot_window (include_frame, include_cursor, filename,
-                                  Lang.bind(this, this._onScreenshotComplete,
-                                            flash, invocation));
-    },
-
-    ScreenshotAsync : function (params, invocation) {
-        let [include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
-        screenshot.screenshot(include_cursor, filename,
-                          Lang.bind(this, this._onScreenshotComplete,
-                                    flash, invocation));
-    },
-
-    SelectAreaAsync: function (params, invocation) {
-        let selectArea = new SelectArea();
-        selectArea.show();
-        selectArea.connect('finished', Lang.bind(this,
-            function(selectArea, areaRectangle) {
-                if (areaRectangle) {
-                    let retval = GLib.Variant.new('(iiii)',
-                        [areaRectangle.x, areaRectangle.y,
-                         areaRectangle.width, areaRectangle.height]);
-                    invocation.return_value(retval);
-                } else {
-                    invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
-                        "Operation was cancelled");
-                }
-            }));
-    },
-
-    FlashArea: function(x, y, width, height) {
-        let flashspot = new Flashspot({ x : x, y : y, width: width, height: height});
-        flashspot.fire();
-    }
-});
-
-const SelectArea = new Lang.Class({
-    Name: 'SelectArea',
-
-    _init: function() {
-        this._startX = -1;
-        this._startY = -1;
-        this._lastX = 0;
-        this._lastY = 0;
-
-        this._initRubberbandColors();
-
-        this._group = new St.Widget({ visible: false,
-                                      reactive: true,
-                                      x: 0,
-                                      y: 0 });
-        Main.uiGroup.add_actor(this._group);
-
-        this._group.connect('button-press-event',
-                            Lang.bind(this, this._onButtonPress));
-        this._group.connect('button-release-event',
-                            Lang.bind(this, this._onButtonRelease));
-        this._group.connect('key-press-event',
-                            Lang.bind(this, this._onKeyPress));
-        this._group.connect('motion-event',
-                            Lang.bind(this, this._onMotionEvent));
-
-        let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.ALL });
-        this._group.add_constraint(constraint);
-
-        this._rubberband = new Clutter.Rectangle({ color: this._background,
-                                                   has_border: true,
-                                                   border_width: 1,
-                                                   border_color: this._border });
-        this._group.add_actor(this._rubberband);
-    },
-
-    show: function() {
-        if (!Main.pushModal(this._group) || this._group.visible)
-            return;
-
-        global.set_cursor(Shell.Cursor.CROSSHAIR);
-        this._group.visible = true;
-    },
-
-    _initRubberbandColors: function() {
-        function colorFromRGBA(rgba) {
-            return new Clutter.Color({ red: rgba.red * 255,
-                                       green: rgba.green * 255,
-                                       blue: rgba.blue * 255,
-                                       alpha: rgba.alpha * 255 });
-        }
-
-        let path = new Gtk.WidgetPath();
-        path.append_type(Gtk.IconView);
-
-        let context = new Gtk.StyleContext();
-        context.set_path(path);
-        context.add_class('rubberband');
-
-        this._background = colorFromRGBA(context.get_background_color(Gtk.StateFlags.NORMAL));
-        this._border = colorFromRGBA(context.get_border_color(Gtk.StateFlags.NORMAL));
-    },
-
-    _getGeometry: function() {
-        return { x: Math.min(this._startX, this._lastX),
-                 y: Math.min(this._startY, this._lastY),
-                 width: Math.abs(this._startX - this._lastX),
-                 height: Math.abs(this._startY - this._lastY) };
-    },
-
-    _onKeyPress: function(actor, event) {
-        if (event.get_key_symbol() == Clutter.Escape)
-            this._destroy(null, false);
-
-        return;
-    },
-
-    _onMotionEvent: function(actor, event) {
-        if (this._startX == -1 || this._startY == -1)
-            return false;
-
-        [this._lastX, this._lastY] = event.get_coords();
-        let geometry = this._getGeometry();
-
-        this._rubberband.set_position(geometry.x, geometry.y);
-        this._rubberband.set_size(geometry.width, geometry.height);
-
-        return false;
-    },
-
-    _onButtonPress: function(actor, event) {
-        [this._startX, this._startY] = event.get_coords();
-        this._rubberband.set_position(this._startX, this._startY);
-
-        return false;
-    },
-
-    _onButtonRelease: function(actor, event) {
-        this._destroy(this._getGeometry(), true);
-        return false;
-    },
-
-    _destroy: function(geometry, fade) {
-        Tweener.addTween(this._group,
-                         { opacity: 0,
-                           time: fade ? 0.2 : 0,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   Main.popModal(this._group);
-                                   this._group.destroy();
-                                   global.unset_cursor();
-
-                                   this.emit('finished', geometry);
-                               })
-                         });
-    }
-});
-Signals.addSignalMethods(SelectArea.prototype);
-
-const FLASHSPOT_ANIMATION_OUT_TIME = 0.5; // seconds
-
-const Flashspot = new Lang.Class({
-    Name: 'Flashspot',
-    Extends: Lightbox.Lightbox,
-
-    _init: function(area) {
-        this.parent(Main.uiGroup, { inhibitEvents: true,
-                                    width: area.width,
-                                    height: area.height });
-
-        this.actor.style_class = 'flashspot';
-        this.actor.set_position(area.x, area.y);
-    },
-
-    fire: function() {
-        this.actor.show();
-        this.actor.opacity = 255;
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: FLASHSPOT_ANIMATION_OUT_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.destroy();
-                           })
-                         });
-    }
-});

js/ui/search.js

@@ -1,25 +1,183 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
+const Util = imports.misc.util;
 
-const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers';
+const FileUtils = imports.misc.fileUtils;
+const Main = imports.ui.main;
+
+// Not currently referenced by the search API, but
+// this enumeration can be useful for provider
+// implementations.
+const MatchType = {
+    NONE: 0,
+    SUBSTRING: 1,
+    PREFIX: 2
+};
+
+const SearchResultDisplay = new Lang.Class({
+    Name: 'SearchResultDisplay',
+
+    _init: function(provider) {
+        this.provider = provider;
+        this.actor = null;
+    },
+
+    /**
+     * renderResults:
+     * @results: List of identifier strings
+     * @terms: List of search term strings
+     *
+     * Display the given search matches which resulted
+     * from the given terms.  It's expected that not
+     * all results will fit in the space for the container
+     * actor; in this case, show as many as makes sense
+     * for your result type.
+     *
+     * The terms are useful for search match highlighting.
+     */
+    renderResults: function(results, terms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * clear:
+     * Remove all results from this display.
+     */
+    clear: function() {
+        this.actor.destroy_all_children();
+    },
+
+    /**
+     * getVisibleResultCount:
+     *
+     * Returns: The number of actors visible.
+     */
+    getVisibleResultCount: function() {
+        throw new Error('Not implemented');
+    },
+});
+
+/**
+ * SearchProvider:
+ *
+ * Subclass this object to add a new result type
+ * to the search system, then call registerProvider()
+ * in SearchSystem with an instance.
+ * Search is asynchronous and uses the
+ * getInitialResultSet()/getSubsearchResultSet() methods.
+ */
+const SearchProvider = new Lang.Class({
+    Name: 'SearchProvider',
+
+    _init: function(title) {
+        this.title = title;
+        this.searchSystem = null;
+    },
+
+    /**
+     * getInitialResultSet:
+     * @terms: Array of search terms, treated as logical AND
+     *
+     * Called when the user first begins a search (most likely
+     * therefore a single term of length one or two), or when
+     * a new term is added.
+     *
+     * Should "return" an array of result identifier strings representing
+     * items which match the given search terms.  This
+     * is expected to be a substring match on the metadata for a given
+     * item.  Ordering of returned results is up to the discretion of the provider,
+     * but you should follow these heruistics:
+     *
+     *  * Put items where the term matches multiple criteria (e.g. name and
+     *    description) before single matches
+     *  * Put items which match on a prefix before non-prefix substring matches
+     *
+     * We say "return" above, but in order to make the query asynchronous, use
+     * this.searchSystem.pushResults();. The return value should be ignored.
+     *
+     * This function should be fast; do not perform unindexed full-text searches
+     * or network queries.
+     */
+    getInitialResultSet: function(terms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getSubsearchResultSet:
+     * @previousResults: Array of item identifiers
+     * @newTerms: Updated search terms
+     *
+     * Called when a search is performed which is a "subsearch" of
+     * the previous search; i.e. when every search term has exactly
+     * one corresponding term in the previous search which is a prefix
+     * of the new term.
+     *
+     * This allows search providers to only search through the previous
+     * result set, rather than possibly performing a full re-query.
+     *
+     * Similar to getInitialResultSet, the return value for this will
+     * be ignored; use this.searchSystem.pushResults();.
+     */
+    getSubsearchResultSet: function(previousResults, newTerms) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getResultMetas:
+     * @ids: Result identifier strings
+     *
+     * Call callback with array of objects with 'id', 'name', (both strings) and
+     * 'createIcon' (function(size) returning a Clutter.Texture) properties
+     * with the same number of members as @ids
+     */
+    getResultMetas: function(ids, callback) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * createResultActor:
+     * @resultMeta: Object with result metadata
+     * @terms: Array of search terms, should be used for highlighting
+     *
+     * Search providers may optionally override this to render a
+     * particular serch result in a custom fashion.  The default
+     * implementation will show the icon next to the name.
+     *
+     * The actor should be an instance of St.Widget, with the style class
+     * 'search-result-content'.
+     */
+    createResultActor: function(resultMeta, terms) {
+        return null;
+    },
+
+    /**
+     * activateResult:
+     * @id: Result identifier string
+     *
+     * Called when the user chooses a given result.
+     */
+    activateResult: function(id) {
+        throw new Error('Not implemented');
+    }
+});
+Signals.addSignalMethods(SearchProvider.prototype);
 
 const SearchSystem = new Lang.Class({
     Name: 'SearchSystem',
 
     _init: function() {
         this._providers = [];
-        this._remoteProviders = [];
         this.reset();
     },
 
     registerProvider: function (provider) {
         provider.searchSystem = this;
         this._providers.push(provider);
-
-        if (provider.isRemoteProvider)
-            this._remoteProviders.push(provider);
     },
 
     unregisterProvider: function (provider) {
@@ -28,20 +186,12 @@ const SearchSystem = new Lang.Class({
             return;
         provider.searchSystem = null;
         this._providers.splice(index, 1);
-
-        let remoteIndex = this._remoteProviders.indexOf(provider);
-        if (remoteIndex != -1)
-            this._remoteProviders.splice(index, 1);
     },
 
     getProviders: function() {
         return this._providers;
     },
 
-    getRemoteProviders: function() {
-        return this._remoteProviders;
-    },
-
     getTerms: function() {
         return this._previousTerms;
     },
@@ -96,7 +246,7 @@ const SearchSystem = new Lang.Class({
                     results.push([provider, []]);
                     provider.getSubsearchResultSet(previousResults, terms);
                 } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.id + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                 }
             }
         } else {
@@ -106,7 +256,7 @@ const SearchSystem = new Lang.Class({
                     results.push([provider, []]);
                     provider.getInitialResultSet(terms);
                 } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.id + ': ' + error.message);
+                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                 }
             }
         }

js/ui/searchDisplay.js

@@ -11,11 +11,10 @@ const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
-const Separator = imports.ui.separator;
 const Search = imports.ui.search;
 
-const MAX_LIST_SEARCH_RESULTS_ROWS = 3;
-const MAX_GRID_SEARCH_RESULTS_ROWS = 1;
+const MAX_SEARCH_RESULTS_ROWS = 1;
+
 
 const SearchResult = new Lang.Class({
     Name: 'SearchResult',
@@ -23,104 +22,34 @@ const SearchResult = new Lang.Class({
     _init: function(provider, metaInfo, terms) {
         this.provider = provider;
         this.metaInfo = metaInfo;
-        this.terms = terms;
-
-        this.actor = new St.Button({ reactive: true,
-                                     can_focus: true,
-                                     track_hover: true,
+        this.actor = new St.Button({ style_class: 'search-result',
+                                     reactive: true,
                                      x_align: St.Align.START,
                                      y_fill: true });
-
         this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this.activate));
-    },
-
-    activate: function() {
-        this.provider.activateResult(this.metaInfo.id, this.terms);
-        Main.overview.toggle();
-    },
-
-    setSelected: function(selected) {
-        if (selected)
-            this.actor.add_style_pseudo_class('selected');
-        else
-            this.actor.remove_style_pseudo_class('selected');
-    }
-});
-
-const ListSearchResult = new Lang.Class({
-    Name: 'ListSearchResult',
-    Extends: SearchResult,
-
-    ICON_SIZE: 64,
-
-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
-
-        this.actor.style_class = 'list-search-result';
-        this.actor.x_fill = true;
-
-        let content = new St.BoxLayout({ style_class: 'list-search-result-content',
-                                         vertical: false });
-        this.actor.set_child(content);
-
-        // An icon for, or thumbnail of, content
-        let icon = this.metaInfo['createIcon'](this.ICON_SIZE);
-        if (icon) {
-            content.add(icon);
-        }
-
-        let details = new St.BoxLayout({ vertical: true });
-        content.add(details, { x_fill: true,
-                               y_fill: false,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
-
-        let title = new St.Label({ style_class: 'list-search-result-title',
-                                   text: this.metaInfo['name'] })
-        details.add(title, { x_fill: false,
-                             y_fill: false,
-                             x_align: St.Align.START,
-                             y_align: St.Align.START });
-
-        // TODO: should highlight terms in the description here
-        if (this.metaInfo['description']) {
-            let description = new St.Label({ style_class: 'list-search-result-description',
-                                             text: '"' + this.metaInfo['description'] + '"' });
-            details.add(description, { x_fill: false,
-                                       y_fill: false,
-                                       x_align: St.Align.START,
-                                       y_align: St.Align.END });
-        }
-    }
-});
-
-const GridSearchResult = new Lang.Class({
-    Name: 'GridSearchResult',
-    Extends: SearchResult,
-
-    _init: function(provider, metaInfo, terms) {
-        this.parent(provider, metaInfo, terms);
-
-        this.actor.style_class = 'grid-search-result';
+        this._dragActorSource = null;
 
         let content = provider.createResultActor(metaInfo, terms);
-        let dragSource = null;
-
         if (content == null) {
-            content = new St.Bin();
+            content = new St.Bin({ style_class: 'search-result-content',
+                                   reactive: true,
+                                   can_focus: true,
+                                   track_hover: true,
+                                   accessible_role: Atk.Role.PUSH_BUTTON });
             let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
                                              { createIcon: this.metaInfo['createIcon'] });
             content.set_child(icon.actor);
+            this._dragActorSource = icon.icon;
             content.label_actor = icon.label;
-            dragSource = icon.icon;
         } else {
             if (content._delegate && content._delegate.getDragActorSource)
-                dragSource = content._delegate.getDragActorSource();
+                this._dragActorSource = content._delegate.getDragActorSource();
         }
-
+        this._content = content;
         this.actor.set_child(content);
 
+        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
+
         let draggable = DND.makeDraggable(this.actor);
         draggable.connect('drag-begin',
                           Lang.bind(this, function() {
@@ -134,18 +63,32 @@ const GridSearchResult = new Lang.Class({
                           Lang.bind(this, function() {
                               Main.overview.endItemDrag(this);
                           }));
+    },
 
-        if (!dragSource)
-            // not exactly right, but alignment problems are hard to notice
-            dragSource = content;
-        this._dragActorSource = dragSource;
+    setSelected: function(selected) {
+        if (selected)
+            this._content.add_style_pseudo_class('selected');
+        else
+            this._content.remove_style_pseudo_class('selected');
+    },
+
+    activate: function() {
+        this.provider.activateResult(this.metaInfo.id);
+        Main.overview.toggle();
+    },
+
+    _onResultClicked: function(actor) {
+        this.activate();
     },
 
     getDragActorSource: function() {
-        return this._dragActorSource;
+        if (this._dragActorSource)
+            return this._dragActorSource;
+        // not exactly right, but alignment problems are hard to notice
+        return this._content;
     },
 
-    getDragActor: function() {
+    getDragActor: function(stageX, stageY) {
         return this.metaInfo['createIcon'](Main.overview.dashIconSize);
     },
 
@@ -153,93 +96,34 @@ const GridSearchResult = new Lang.Class({
         if (this.provider.dragActivateResult)
             this.provider.dragActivateResult(this.metaInfo.id, params);
         else
-            this.provider.activateResult(this.metaInfo.id, this.terms);
+            this.provider.activateResult(this.metaInfo.id, params);
     }
 });
 
-const ListSearchResults = new Lang.Class({
-    Name: 'ListSearchResults',
-
-    _init: function(provider) {
-        this.provider = provider;
-
-        this.actor = new St.BoxLayout({ style_class: 'search-section-content' });
-        this.providerIcon = new ProviderIcon(provider);
-        this.providerIcon.connect('clicked', Lang.bind(this,
-            function() {
-                provider.launchSearch(this._terms);
-                Main.overview.toggle();
-            }));
-
-        this.actor.add(this.providerIcon, { x_fill: false,
-                                            y_fill: false,
-                                            x_align: St.Align.START,
-                                            y_align: St.Align.START });
-
-        this._content = new St.BoxLayout({ style_class: 'list-search-results',
-                                           vertical: true });
-        this.actor.add_actor(this._content);
-
-        this._notDisplayedResult = [];
-        this._terms = [];
-        this._pendingClear = false;
-    },
-
-    getResultsForDisplay: function() {
-        let alreadyVisible = this._pendingClear ? 0 : this.getVisibleResultCount();
-        let canDisplay = MAX_LIST_SEARCH_RESULTS_ROWS - alreadyVisible;
-
-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
-    },
-
-    getVisibleResultCount: function() {
-        return this._content.get_n_children();
-    },
-
-    hasMoreResults: function() {
-        return this._notDisplayedResult.length > 0;
-    },
-
-    setResults: function(results, terms) {
-        // copy the lists
-        this._notDisplayedResult = results.slice(0);
-        this._terms = terms.slice(0);
-        this._pendingClear = true;
-    },
-
-    renderResults: function(metas) {
-        for (let i = 0; i < metas.length; i++) {
-            let display = new ListSearchResult(this.provider, metas[i], this._terms);
-            this._content.add_actor(display.actor);
-        }
-    },
-
-    clear: function () {
-        this._content.destroy_all_children();
-        this._pendingClear = false;
-    },
-
-    getFirstResult: function() {
-        if (this.getVisibleResultCount() > 0)
-            return this._content.get_child_at_index(0)._delegate;
-        else
-            return null;
-    }
-});
 
 const GridSearchResults = new Lang.Class({
     Name: 'GridSearchResults',
+    Extends: Search.SearchResultDisplay,
 
-    _init: function(provider) {
-        this.provider = provider;
+    _init: function(provider, grid) {
+        this.parent(provider);
 
-        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
-                                             xAlign: St.Align.START });
-        this.actor = new St.Bin({ x_align: St.Align.MIDDLE });
+        this._grid = grid || new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
+                                                     xAlign: St.Align.START });
+        this.actor = new St.Bin({ x_align: St.Align.START });
 
         this.actor.set_child(this._grid.actor);
+        this._width = 0;
+        this.actor.connect('notify::width', Lang.bind(this, function() {
+            this._width = this.actor.width;
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+                let results = this.getResultsForDisplay();
+                if (results.length == 0)
+                    return;
 
+                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
+            }));
+        }));
         this._notDisplayedResult = [];
         this._terms = [];
         this._pendingClear = false;
@@ -247,21 +131,18 @@ const GridSearchResults = new Lang.Class({
 
     getResultsForDisplay: function() {
         let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
-        let canDisplay = this._grid.childrenInRow(this.actor.width) * this._grid.getRowLimit()
+        let canDisplay = this._grid.childrenInRow(this._width) * this._grid.getRowLimit()
                          - alreadyVisible;
 
-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
+        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
+
+        return this._notDisplayedResult.splice(0, numResults);
     },
 
     getVisibleResultCount: function() {
         return this._grid.visibleItemsCount();
     },
 
-    hasMoreResults: function() {
-        return this._notDisplayedResult.length > 0;
-    },
-
     setResults: function(results, terms) {
         // copy the lists
         this._notDisplayedResult = results.slice(0);
@@ -271,7 +152,7 @@ const GridSearchResults = new Lang.Class({
 
     renderResults: function(metas) {
         for (let i = 0; i < metas.length; i++) {
-            let display = new GridSearchResult(this.provider, metas[i], this._terms);
+            let display = new SearchResult(this.provider, metas[i], this._terms);
             this._grid.addItem(display.actor);
         }
     },
@@ -302,20 +183,26 @@ const SearchResults = new Lang.Class({
         this._content = new St.BoxLayout({ name: 'searchResultsContent',
                                            vertical: true });
 
-        this._scrollView = new St.ScrollView({ x_fill: true,
-                                               y_fill: false,
-                                               style_class: 'vfade' });
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this._scrollView.add_actor(this._content);
-        let action = new Clutter.PanAction({ interpolate: true });
-        action.connect('pan', Lang.bind(this, this._onPan));
-        this._scrollView.add_action(action);
+        let scrollView = new St.ScrollView({ x_fill: true,
+                                             y_fill: false,
+                                             style_class: 'vfade' });
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        scrollView.add_actor(this._content);
 
-        this.actor.add(this._scrollView, { x_fill: true,
-                                           y_fill: true,
-                                           expand: true,
-                                           x_align: St.Align.START,
-                                           y_align: St.Align.START });
+        this.actor.add(scrollView, { x_fill: true,
+                                     y_fill: true,
+                                     expand: true,
+                                     x_align: St.Align.START,
+                                     y_align: St.Align.START });
+        this.actor.connect('notify::mapped', Lang.bind(this,
+            function() {
+                if (!this.actor.mapped)
+                    return;
+
+                let adjustment = scrollView.vscroll.adjustment;
+                let direction = Overview.SwipeScrollDirection.VERTICAL;
+                Main.overview.setScrollAdjustment(adjustment, direction);
+            }));
 
         this._statusText = new St.Label({ style_class: 'search-statustext' });
         this._statusBin = new St.Bin({ x_align: St.Align.MIDDLE,
@@ -332,37 +219,22 @@ const SearchResults = new Lang.Class({
         this._defaultResult = null;
     },
 
-    _onPan: function(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
-        let adjustment = this._scrollView.vscroll.adjustment;
-        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
-        return false;
-    },
-
     createProviderMeta: function(provider) {
         let providerBox = new St.BoxLayout({ style_class: 'search-section',
                                              vertical: true });
-        let providerIcon = null;
-        let resultDisplay = null;
+        let title = new St.Label({ style_class: 'search-section-header',
+                                   text: provider.title });
+        providerBox.add(title, { x_fill: false, x_align: St.Align.START });
 
-        if (provider.appInfo) {
-            resultDisplay = new ListSearchResults(provider);
-            providerIcon = resultDisplay.providerIcon;
-        } else {
-            resultDisplay = new GridSearchResults(provider);
-        }
-
-        let resultDisplayBin = new St.Bin({ child: resultDisplay.actor,
+        let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
                                             x_fill: true,
                                             y_fill: true });
         providerBox.add(resultDisplayBin, { expand: true });
-
-        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
-        providerBox.add(separator.actor);
+        let resultDisplay = new GridSearchResults(provider);
+        resultDisplayBin.set_child(resultDisplay.actor);
 
         this._providerMeta.push({ provider: provider,
                                   actor: providerBox,
-                                  icon: providerIcon,
                                   resultDisplay: resultDisplay });
         this._content.add(providerBox);
     },
@@ -469,11 +341,6 @@ const SearchResults = new Lang.Class({
             meta.resultDisplay.setResults(providerResults, terms);
             let results = meta.resultDisplay.getResultsForDisplay();
 
-            if (meta.icon)
-                meta.icon.moreIcon.visible =
-                    meta.resultDisplay.hasMoreResults() &&
-                    provider.canLaunchSearch;
-
             provider.getResultMetas(results, Lang.bind(this, function(metas) {
                 this._clearDisplayForProvider(provider);
                 meta.actor.show();
@@ -519,37 +386,10 @@ const SearchResults = new Lang.Class({
 
         let from = this._defaultResult ? this._defaultResult.actor : null;
         this.actor.navigate_focus(from, direction, false);
-    }
-});
-
-const ProviderIcon = new Lang.Class({
-    Name: 'ProviderIcon',
-    Extends: St.Button,
-
-    PROVIDER_ICON_SIZE: 48,
-
-    _init: function(provider) {
-        this.provider = provider;
-        this.parent({ style_class: 'search-provider-icon',
-                      reactive: true,
-                      can_focus: true,
-                      track_hover: true });
-
-        this._content = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this.set_child(this._content);
-
-        let rtl = (this.get_text_direction() == Clutter.TextDirection.RTL);
-
-        this.moreIcon = new St.Widget({ style_class: 'search-provider-icon-more',
-                                        visible: false,
-                                        x_align: rtl ? Clutter.ActorAlign.START : Clutter.ActorAlign.END,
-                                        y_align: Clutter.ActorAlign.END,
-                                        x_expand: true,
-                                        y_expand: true });
-
-        let icon = new St.Icon({ icon_size: this.PROVIDER_ICON_SIZE,
-                                 gicon: provider.appInfo.get_icon() });
-        this._content.add_actor(icon);
-        this._content.add_actor(this.moreIcon);
+        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/separator.js

@@ -1,35 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Cairo = imports.cairo;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const HorizontalSeparator = new Lang.Class({
-    Name: 'HorizontalSeparator',
-
-    _init: function (params) {
-        this.actor = new St.DrawingArea(params);
-        this.actor.connect('repaint', Lang.bind(this, this._onRepaint));
-    },
-
-    _onRepaint: function(area) {
-        let cr = area.get_context();
-        let themeNode = area.get_theme_node();
-        let [width, height] = area.get_surface_size();
-        let margin = themeNode.get_length('-margin-horizontal');
-        let gradientHeight = themeNode.get_length('-gradient-height');
-        let startColor = themeNode.get_color('-gradient-start');
-        let endColor = themeNode.get_color('-gradient-end');
-
-        let gradientWidth = (width - margin * 2);
-        let gradientOffset = (height - gradientHeight) / 2;
-        let pattern = new Cairo.LinearGradient(margin, gradientOffset, width - margin, gradientOffset + gradientHeight);
-        pattern.addColorStopRGBA(0, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
-        pattern.addColorStopRGBA(0.5, endColor.red / 255, endColor.green / 255, endColor.blue / 255, endColor.alpha / 255);
-        pattern.addColorStopRGBA(1, startColor.red / 255, startColor.green / 255, startColor.blue / 255, startColor.alpha / 255);
-        cr.setSource(pattern);
-        cr.rectangle(margin, gradientOffset, gradientWidth, gradientHeight);
-        cr.fill();
-        cr.$dispose();
-    }
-});

js/ui/sessionMode.js

@@ -1,12 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
-const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 
@@ -14,12 +10,11 @@ const DEFAULT_MODE = 'restrictive';
 
 const _modes = {
     'restrictive': {
-        parentMode: null,
         hasOverview: false,
         showCalendarEvents: false,
         allowSettings: false,
         allowExtensions: false,
-        enabledExtensions: [],
+        allowKeybindingsWhenModal: false,
         hasRunDialog: false,
         hasWorkspaces: false,
         hasWindows: false,
@@ -34,22 +29,21 @@ const _modes = {
             center: [],
             right: []
         },
-        panelStyle: null
     },
 
     'gdm': {
+        allowKeybindingsWhenModal: true,
         hasNotifications: true,
         isGreeter: true,
         isPrimary: true,
         unlockDialog: imports.gdm.loginDialog.LoginDialog,
         components: ['polkitAgent'],
         panel: {
-            left: ['logo'],
+            left: [],
             center: ['dateMenu'],
             right: ['a11y', 'display', 'keyboard',
                     'volume', 'battery', 'powerMenu']
-        },
-        panelStyle: 'login-screen'
+        }
     },
 
     'lock-screen': {
@@ -62,7 +56,6 @@ const _modes = {
             center: [],
             right: ['lockScreen']
         },
-        panelStyle: 'lock-screen'
     },
 
     'unlock-dialog': {
@@ -74,7 +67,6 @@ const _modes = {
             center: [],
             right: ['a11y', 'keyboard', 'lockScreen']
         },
-        panelStyle: 'unlock-screen'
     },
 
     'initial-setup': {
@@ -110,48 +102,11 @@ const _modes = {
     }
 };
 
-function _getModes(modesLoadedCallback) {
-    FileUtils.collectFromDatadirsAsync('modes',
-                                       { processFile: _loadMode,
-                                         loadedCallback: modesLoadedCallback,
-                                         data: _modes });
-}
-
-function _loadMode(file, info, loadedData) {
-    let name = info.get_name();
-    let suffix = name.indexOf('.json');
-    let modeName = suffix == -1 ? name : name.slice(name, suffix);
-
-    if (loadedData.hasOwnProperty(modeName))
-        return;
-
-    let fileContent, success, tag, newMode;
-    try {
-        [success, fileContent, tag] = file.load_contents(null);
-        newMode = JSON.parse(fileContent);
-    } catch(e) {
-        return;
-    }
-
-    loadedData[modeName] = {};
-    let propBlacklist = ['unlockDialog'];
-    for (let prop in loadedData[DEFAULT_MODE]) {
-        if (newMode[prop] !== undefined &&
-            propBlacklist.indexOf(prop) == -1)
-            loadedData[modeName][prop]= newMode[prop];
-    }
-    loadedData[modeName]['isPrimary'] = true;
-}
-
 function listModes() {
-    _getModes(function(modes) {
-        let names = Object.getOwnPropertyNames(modes);
-        for (let i = 0; i < names.length; i++)
-            if (_modes[names[i]].isPrimary)
-                print(names[i]);
-        Mainloop.quit('listModes');
-    });
-    Mainloop.run('listModes');
+    let modes = Object.getOwnPropertyNames(_modes);
+    for (let i = 0; i < modes.length; i++)
+        if (_modes[modes[i]].isPrimary)
+            print(modes[i]);
 }
 
 const SessionMode = new Lang.Class({
@@ -159,18 +114,10 @@ const SessionMode = new Lang.Class({
 
     _init: function() {
         global.connect('notify::session-mode', Lang.bind(this, this._sync));
-        this._modes = _modes;
-        this._modeStack = [DEFAULT_MODE];
+        let mode = _modes[global.session_mode].isPrimary ? global.session_mode
+                                                         : 'user';
+        this._modeStack = [mode];
         this._sync();
-
-        _getModes(Lang.bind(this, function(modes) {
-            this._modes = modes;
-            let primary = modes[global.session_mode] &&
-                          modes[global.session_mode].isPrimary;
-            let mode = primary ? global.session_mode : 'user';
-            this._modeStack = [mode];
-            this._sync();
-        }));
     },
 
     pushMode: function(mode) {
@@ -197,14 +144,8 @@ const SessionMode = new Lang.Class({
     },
 
     _sync: function() {
-        let params = this._modes[this.currentMode];
-        let defaults;
-        if (params.parentMode)
-            defaults = Params.parse(this._modes[params.parentMode],
-                                    this._modes[DEFAULT_MODE]);
-        else
-            defaults = this._modes[DEFAULT_MODE];
-        params = Params.parse(params, defaults);
+        let params = _modes[this.currentMode];
+        params = Params.parse(params, _modes[DEFAULT_MODE]);
 
         // A simplified version of Lang.copyProperties, handles
         // undefined as a special case for "no change / inherit from previous mode"

js/ui/shellDBus.js

@@ -9,8 +9,8 @@ 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 Screenshot = imports.ui.screenshot;
 
 const GnomeShellIface = <interface name="org.gnome.Shell">
 <method name="Eval">
@@ -18,7 +18,34 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
     <arg type="b" direction="out" name="success" />
     <arg type="s" direction="out" name="result" />
 </method>
-<property name="Mode" type="s" access="read" />
+<method name="ScreenshotArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="ScreenshotWindow">
+    <arg type="b" direction="in" name="include_frame"/>
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="Screenshot">
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="FlashArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+</method>
 <property name="OverviewActive" type="b" access="readwrite" />
 <property name="ShellVersion" type="s" access="read" />
 </interface>;
@@ -48,7 +75,6 @@ const GnomeShell = new Lang.Class({
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');
 
         this._extensionsSerivce = new GnomeShellExtensions();
-        this._screenshotService = new Screenshot.ScreenshotService();
     },
 
     /**
@@ -84,7 +110,81 @@ const GnomeShell = new Lang.Class({
         return [success, returnValue];
     },
 
-    Mode: global.session_mode,
+    _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
+     * in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotAreaAsync : function (params, invocation) {
+        let [x, y, width, height, flash, filename, callback] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_area (x, y, width, height, filename,
+                                Lang.bind(this, this._onScreenshotComplete,
+                                          flash, invocation));
+    },
+
+    /**
+     * ScreenshotWindow:
+     * @include_frame: Whether to include the frame or not
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the window area or not
+     * @filename: The filename for the screenshot
+     *
+     * Takes a screenshot of the focused window (optionally omitting the frame)
+     * and saves it in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotWindowAsync : function (params, invocation) {
+        let [include_frame, include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot_window (include_frame, include_cursor, filename,
+                                  Lang.bind(this, this._onScreenshotComplete,
+                                            flash, invocation));
+    },
+
+    /**
+     * Screenshot:
+     * @filename: The filename for the screenshot
+     * @include_cursor: Whether to include the cursor image or not
+     * @flash: Whether to flash the screen or not
+     *
+     * Takes a screenshot of the whole screen and saves it
+     * in @filename as png image, it returns a boolean
+     * indicating whether the operation was successful or not.
+     *
+     */
+    ScreenshotAsync : function (params, invocation) {
+        let [include_cursor, flash, filename] = params;
+        let screenshot = new Shell.Screenshot();
+        screenshot.screenshot(include_cursor, filename,
+                          Lang.bind(this, this._onScreenshotComplete,
+                                    flash, invocation));
+    },
+
+    FlashArea: function(x, y, width, height) {
+        let flashspot = new Flashspot.Flashspot({ x : x, y : y, width: width, height: height});
+        flashspot.fire();
+    },
 
     get OverviewActive() {
         return Main.overview.visible;

js/ui/shellMountOperation.js

@@ -19,8 +19,6 @@ const ShellEntry = imports.ui.shellEntry;
 
 const LIST_ITEM_ICON_SIZE = 48;
 
-const REMEMBER_MOUNT_PASSWORD_KEY = 'remember-mount-password';
-
 /* ------ Common Utils ------- */
 function _setLabelText(label, text) {
     if (text) {
@@ -389,8 +387,7 @@ const ShellMountPasswordDialog = new Lang.Class({
         if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
             this._rememberChoice = new CheckBox.CheckBox();
             this._rememberChoice.getLabelActor().text = _("Remember Password");
-            this._rememberChoice.actor.checked =
-                global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY);
+            this._rememberChoice.actor.checked = true;
             this._messageBox.add(this._rememberChoice.actor);
         } else {
             this._rememberChoice = null;
@@ -422,8 +419,6 @@ const ShellMountPasswordDialog = new Lang.Class({
     },
 
     _onEntryActivate: function() {
-        global.settings.set_boolean(REMEMBER_MOUNT_PASSWORD_KEY,
-            this._rememberChoice && this._rememberChoice.actor.checked);
         this.emit('response', 1,
             this._passwordEntry.get_text(),
             this._rememberChoice &&

js/ui/status/accessibility.js

@@ -27,7 +27,6 @@ const KEY_VISUAL_BELL      = 'visual-bell';
 const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
 const KEY_GTK_THEME      = 'gtk-theme';
 const KEY_ICON_THEME     = 'icon-theme';
-const KEY_WM_THEME       = 'theme';
 const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';
 
 const HIGH_CONTRAST_THEME = 'HighContrast';
@@ -102,35 +101,28 @@ const ATIndicator = new Lang.Class({
     },
 
     _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema: WM_SCHEMA });
-        let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
-        let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
-        let wmTheme = wmSettings.get_string(KEY_WM_THEME);
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let gtkTheme = settings.get_string(KEY_GTK_THEME);
+        let iconTheme = settings.get_string(KEY_ICON_THEME);
         let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
         let highContrast = this._buildItemExtended(
             _("High Contrast"),
             hasHC,
-            interfaceSettings.is_writable(KEY_GTK_THEME) &&
-            interfaceSettings.is_writable(KEY_ICON_THEME) &&
-            wmSettings.is_writable(KEY_WM_THEME),
+            settings.is_writable(KEY_GTK_THEME) && settings.is_writable(KEY_ICON_THEME),
             function (enabled) {
                 if (enabled) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
-                    interfaceSettings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                    wmSettings.set_string(KEY_WM_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
                 } else if(!hasHC) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
-                    interfaceSettings.set_string(KEY_ICON_THEME, iconTheme);
-                    wmSettings.set_string(KEY_WM_THEME, wmTheme);
+                    settings.set_string(KEY_GTK_THEME, gtkTheme);
+                    settings.set_string(KEY_ICON_THEME, iconTheme);
                 } else {
-                    interfaceSettings.reset(KEY_GTK_THEME);
-                    interfaceSettings.reset(KEY_ICON_THEME);
-                    wmSettings.reset(KEY_WM_THEME);
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
                 }
             });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+        settings.connect('changed::' + KEY_GTK_THEME, function() {
+            let value = settings.get_string(KEY_GTK_THEME);
             if (value == HIGH_CONTRAST_THEME) {
                 highContrast.setToggleState(true);
             } else {
@@ -138,16 +130,11 @@ const ATIndicator = new Lang.Class({
                 gtkTheme = value;
             }
         });
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+        settings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = settings.get_string(KEY_ICON_THEME);
             if (value != HIGH_CONTRAST_THEME)
                 iconTheme = value;
         });
-        wmSettings.connect('changed::' + KEY_WM_THEME, function() {
-            let value = wmSettings.get_string(KEY_WM_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                wmTheme = value;
-        });
         return highContrast;
     },
 

js/ui/status/bluetooth.js

@@ -80,7 +80,7 @@ const Indicator = new Lang.Class({
         this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
         this._updateFullMenu();
 
-        this.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
+        this.menu.addSettingsAction(_("Bluetooth Settings"), 'bluetooth-properties.desktop');
 
         this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
         this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
@@ -239,6 +239,22 @@ const Indicator = new Lang.Class({
                 this._applet.send_to_address(device.bdaddr, device.alias);
             }));
         }
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+                this._applet.browse_address(device.bdaddr, event.get_time(),
+                    Lang.bind(this, function(applet, result) {
+                        try {
+                            applet.browse_address_finish(result);
+                        } catch (e) {
+                            this._ensureSource();
+                            this._source.notify(new MessageTray.Notification(this._source,
+                                 _("Bluetooth"),
+                                 _("Error browsing device"),
+                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+                        }
+                    }));
+            }));
+        }
 
         switch (device.type) {
         case GnomeBluetoothApplet.Type.KEYBOARD:
@@ -353,7 +369,6 @@ const ConfirmNotification = new Lang.Class({
     _init: function(source, applet, device_path, name, long_name, pin) {
         this.parent(source,
                     _("Bluetooth"),
-                    /* Translators: argument is the device short name */
                     _("Pairing confirmation for %s").format(name),
                     { customContent: true });
         this.setResident(true);
@@ -363,7 +378,6 @@ const ConfirmNotification = new Lang.Class({
         this.addBody(_("Device %s wants to pair with this computer").format(long_name));
         this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));
 
-        /* Translators: this is the verb, not the noun */
         this.addButton('matches', _("Matches"));
         this.addButton('does-not-match', _("Does not match"));
 
@@ -446,5 +460,10 @@ const PinNotification = new Lang.Class({
             return this._entry.clutter_text.text.length == 6;
         else
             return true;
+    },
+
+    grabFocus: function(lockTray) {
+        this.parent(lockTray);
+        global.stage.set_key_focus(this._entry);
     }
 });

js/ui/status/keyboard.js

@@ -1,11 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -23,7 +21,6 @@ try {
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const SwitcherPopup = imports.ui.switcherPopup;
 const Util = imports.misc.util;
 
 const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
@@ -50,7 +47,6 @@ const IBusManager = new Lang.Class({
         this._engines = {};
         this._ready = false;
         this._registerPropertiesId = 0;
-        this._currentEngineName = null;
 
         this._nameWatcherId = Gio.DBus.session.watch_name(IBus.SERVICE_IBUS,
                                                           Gio.BusNameWatcherFlags.NONE,
@@ -70,10 +66,6 @@ const IBusManager = new Lang.Class({
         this._engines = {};
         this._ready = false;
         this._registerPropertiesId = 0;
-        this._currentEngineName = null;
-
-        if (this._readyCallback)
-            this._readyCallback(false);
     },
 
     _onNameAppeared: function() {
@@ -97,10 +89,12 @@ const IBusManager = new Lang.Class({
                 let name = enginesList[i].get_name();
                 this._engines[name] = enginesList[i];
             }
-            this._updateReadiness();
         } else {
             this._clear();
+            return;
         }
+
+        this._updateReadiness();
     },
 
     _initPanelService: function(ibus, result) {
@@ -111,31 +105,27 @@ const IBusManager = new Lang.Class({
             this._candidatePopup.setPanelService(this._panelService);
             // Need to set this to get 'global-engine-changed' emitions
             this._ibus.set_watch_ibus_signal(true);
-            this._ibus.connect('global-engine-changed', Lang.bind(this, this._engineChanged));
+            this._ibus.connect('global-engine-changed', Lang.bind(this, this._resetProperties));
             this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
-            // If an engine is already active we need to get its properties
-            this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
-                let engine = this._ibus.get_global_engine_async_finish(result);
-                if (!engine)
-                    return;
-                this._engineChanged(this._ibus, engine.get_name());
-            }));
-            this._updateReadiness();
+            this._resetProperties();
         } else {
             this._clear();
+            return;
         }
+
+        this._updateReadiness();
     },
 
     _updateReadiness: function() {
         this._ready = (Object.keys(this._engines).length > 0 &&
                        this._panelService != null);
 
-        if (this._readyCallback)
-            this._readyCallback(this._ready);
+        if (this._ready && this._readyCallback)
+            this._readyCallback();
     },
 
-    _engineChanged: function(bus, engineName) {
-        this._currentEngineName = engineName;
+    _resetProperties: function() {
+        this.emit('properties-registered', null);
 
         if (this._registerPropertiesId != 0)
             return;
@@ -148,18 +138,25 @@ const IBusManager = new Lang.Class({
                 this._panelService.disconnect(this._registerPropertiesId);
                 this._registerPropertiesId = 0;
 
-                this.emit('properties-registered', this._currentEngineName, props);
+                this.emit('properties-registered', props);
             }));
     },
 
     _updateProperty: function(panel, prop) {
-        this.emit('property-updated', this._currentEngineName, prop);
+        this.emit('property-updated', prop);
     },
 
     activateProperty: function(key, state) {
         this._panelService.property_activate(key, state);
     },
 
+    hasProperties: function(id) {
+        if (id == 'anthy')
+            return true;
+
+        return false;
+    },
+
     getEngineDesc: function(id) {
         if (!IBus || !this._ready)
             return null;
@@ -184,127 +181,16 @@ const LayoutMenuItem = new Lang.Class({
     }
 });
 
-const InputSource = new Lang.Class({
-    Name: 'InputSource',
-
-    _init: function(type, id, displayName, shortName, index) {
-        this.type = type;
-        this.id = id;
-        this.displayName = displayName;
-        this._shortName = shortName;
-        this.index = index;
-
-        this._menuItem = new LayoutMenuItem(this.displayName, this._shortName);
-        this._menuItem.connect('activate', Lang.bind(this, this.activate));
-        this._indicatorLabel = new St.Label({ text: this._shortName });
-
-        this.properties = null;
-    },
-
-    destroy: function() {
-        this._menuItem.destroy();
-        this._indicatorLabel.destroy();
-    },
-
-    get shortName() {
-        return this._shortName;
-    },
-
-    set shortName(v) {
-        this._shortName = v;
-        this._menuItem.indicator.set_text(v);
-        this._indicatorLabel.set_text(v);
-    },
-
-    get menuItem() {
-        return this._menuItem;
-    },
-
-    get indicatorLabel() {
-        return this._indicatorLabel;
-    },
-
-    activate: function() {
-        this.emit('activate');
-    },
-});
-Signals.addSignalMethods(InputSource.prototype);
-
-const InputSourcePopup = new Lang.Class({
-    Name: 'InputSourcePopup',
-    Extends: SwitcherPopup.SwitcherPopup,
-
-    _init: function(items, action, actionBackward) {
-        this.parent(items);
-
-        this._action = action;
-        this._actionBackward = actionBackward;
-    },
-
-    _createSwitcher: function() {
-        this._switcherList = new InputSourceSwitcher(this._items);
-        return true;
-    },
-
-    _initialSelection: function(backward, binding) {
-        if (binding == 'switch-input-source') {
-            if (backward)
-                this._selectedIndex = this._items.length - 1;
-        } else if (binding == 'switch-input-source-backward') {
-            if (!backward)
-                this._selectedIndex = this._items.length - 1;
-        }
-        this._select(this._selectedIndex);
-    },
-
-    _keyPressHandler: function(keysym, backwards, action) {
-        if (action == this._action)
-            this._select(backwards ? this._previous() : this._next());
-        else if (action == this._actionBackward)
-            this._select(backwards ? this._next() : this._previous());
-        else if (keysym == Clutter.Left)
-            this._select(this._previous());
-        else if (keysym == Clutter.Right)
-            this._select(this._next());
-    },
-
-    _finish : function() {
-        this.parent();
-
-        this._items[this._selectedIndex].activate();
-    },
-});
-
-const InputSourceSwitcher = new Lang.Class({
-    Name: 'InputSourceSwitcher',
-    Extends: SwitcherPopup.SwitcherList,
-
-    _init: function(items) {
-        this.parent(true);
-
-        for (let i = 0; i < items.length; i++)
-            this._addIcon(items[i]);
-    },
-
-    _addIcon: function(item) {
-        let box = new St.BoxLayout({ vertical: true });
-
-        let bin = new St.Bin({ style_class: 'input-source-switcher-symbol' });
-        let symbol = new St.Label({ text: item.shortName });
-        bin.set_child(symbol);
-        box.add(bin, { x_fill: false, y_fill: false } );
-
-        let text = new St.Label({ text: item.displayName });
-        box.add(text, { x_fill: false });
-
-        this.addItem(box, text);
-    }
-});
-
 const InputSourceIndicator = new Lang.Class({
     Name: 'InputSourceIndicator',
     Extends: PanelMenu.Button,
 
+    _propertiesWhitelist: [
+        'InputMode',
+        'TypingMode',
+        'DictMode'
+    ],
+
     _init: function() {
         this.parent(0.0, _("Keyboard"));
 
@@ -315,36 +201,14 @@ const InputSourceIndicator = new Lang.Class({
         this.actor.add_actor(this._container);
         this.actor.add_style_class_name('panel-status-button');
 
-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list indexed by their index there
-        this._inputSources = {};
-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list of type INPUT_SOURCE_TYPE_IBUS
-        // indexed by the IBus ID
-        this._ibusSources = {};
+        this._labelActors = {};
+        this._layoutItems = {};
 
-        this._currentSource = null;
-
-        // All valid input sources currently in the gsettings
-        // KEY_INPUT_SOURCES list ordered by most recently used
-        this._mruSources = [];
-        this._keybindingAction =
-            Main.wm.addKeybinding('switch-input-source',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES,
-                                  Main.KeybindingMode.ALL,
-                                  Lang.bind(this, this._switchInputSource));
-        this._keybindingActionBackward =
-            Main.wm.addKeybinding('switch-input-source-backward',
-                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES |
-                                  Meta.KeyBindingFlags.REVERSED,
-                                  Main.KeybindingMode.ALL,
-                                  Lang.bind(this, this._switchInputSource));
         this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
         this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
         this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
 
+        this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
         this._xkbInfo = new GnomeDesktop.XkbInfo();
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
@@ -353,8 +217,9 @@ const InputSourceIndicator = new Lang.Class({
         this.menu.addMenuItem(this._propSection);
         this._propSection.actor.hide();
 
-        this._ibusReady = false;
-        this._ibusManager = new IBusManager(Lang.bind(this, this._ibusReadyCallback));
+        this._properties = null;
+
+        this._ibusManager = new IBusManager(Lang.bind(this, this._inputSourcesChanged));
         this._ibusManager.connect('properties-registered', Lang.bind(this, this._ibusPropertiesRegistered));
         this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
         this._inputSourcesChanged();
@@ -366,13 +231,6 @@ const InputSourceIndicator = new Lang.Class({
         this._sessionUpdated();
 
         this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
-
-        this._sourcesPerWindow = false;
-        this._focusWindowNotifyId = 0;
-        this._overviewShowingId = 0;
-        this._overviewHiddenId = 0;
-        this._settings.connect('changed::per-window', Lang.bind(this, this._sourcesPerWindowChanged));
-        this._sourcesPerWindowChanged();
     },
 
     _sessionUpdated: function() {
@@ -383,29 +241,18 @@ const InputSourceIndicator = new Lang.Class({
         this._showLayoutItem.actor.visible = Main.sessionMode.allowSettings;
     },
 
-    _ibusReadyCallback: function(ready) {
-        if (this._ibusReady == ready)
-            return;
-
-        this._ibusReady = ready;
-        this._mruSources = [];
-        this._inputSourcesChanged();
-    },
-
-    _switchInputSource: function(display, screen, window, binding) {
-        let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
-        let modifiers = binding.get_modifiers();
-        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        if (!popup.show(backwards, binding.get_name(), binding.get_mask()))
-            popup.destroy();
-    },
-
     _currentInputSourceChanged: function() {
-        let nVisibleSources = Object.keys(this._inputSources).length;
-        let newSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        let newSource = this._inputSources[newSourceIndex];
+        let nVisibleSources = Object.keys(this._layoutItems).length;
+        let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        let newLayoutItem = this._layoutItems[newCurrentSourceIndex];
+        let hasProperties;
 
-        if (!newSource || (nVisibleSources < 2 && !newSource.properties)) {
+        if (newLayoutItem)
+            hasProperties = this._ibusManager.hasProperties(newLayoutItem.ibusEngineId);
+        else
+            hasProperties = false;
+
+        if (!newLayoutItem || (nVisibleSources < 2 && !hasProperties)) {
             // This source index might be invalid if we weren't able
             // to build a menu item for it, so we hide ourselves since
             // we can't fix it here. *shrug*
@@ -419,125 +266,106 @@ const InputSourceIndicator = new Lang.Class({
 
         this.actor.show();
 
-        let oldSource;
-        [oldSource, this._currentSource] = [this._currentSource, newSource];
-
-        if (oldSource) {
-            oldSource.menuItem.setShowDot(false);
-            this._container.set_skip_paint(oldSource.indicatorLabel, true);
+        if (this._layoutItems[this._currentSourceIndex]) {
+            this._layoutItems[this._currentSourceIndex].setShowDot(false);
+            this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
         }
 
-        newSource.menuItem.setShowDot(true);
-        this._container.set_skip_paint(newSource.indicatorLabel, false);
+        newLayoutItem.setShowDot(true);
 
-        this._buildPropSection(newSource.properties);
+        let newLabelActor = this._labelActors[newCurrentSourceIndex];
+        this._container.set_skip_paint(newLabelActor, false);
 
-        for (let i = 1; i < this._mruSources.length; ++i)
-            if (this._mruSources[i] == newSource) {
-                let currentSource = this._mruSources.splice(i, 1);
-                this._mruSources = currentSource.concat(this._mruSources);
-                break;
-            }
+        if (hasProperties)
+            newLabelActor.set_text(newLayoutItem.indicator.get_text());
 
-        this._changePerWindowSource();
+        this._currentSourceIndex = newCurrentSourceIndex;
     },
 
     _inputSourcesChanged: function() {
         let sources = this._settings.get_value(KEY_INPUT_SOURCES);
         let nSources = sources.n_children();
 
-        for (let i in this._inputSources)
-            this._inputSources[i].destroy();
+        for (let i in this._layoutItems)
+            this._layoutItems[i].destroy();
 
-        this._inputSources = {};
-        this._ibusSources = {};
+        for (let i in this._labelActors)
+            this._labelActors[i].destroy();
 
-        let inputSourcesByShortName = {};
+        this._layoutItems = {};
+        this._labelActors = {};
+
+        let infos = [];
+        let infosByShortName = {};
 
         for (let i = 0; i < nSources; i++) {
-            let displayName;
-            let shortName;
+            let info = { exists: false };
             let [type, id] = sources.get_child_value(i).deep_unpack();
-            let exists = false;
 
             if (type == INPUT_SOURCE_TYPE_XKB) {
-                [exists, displayName, shortName, , ] =
+                [info.exists, info.displayName, info.shortName, , ] =
                     this._xkbInfo.get_layout_info(id);
             } else if (type == INPUT_SOURCE_TYPE_IBUS) {
                 let engineDesc = this._ibusManager.getEngineDesc(id);
                 if (engineDesc) {
                     let language = IBus.get_language_name(engineDesc.get_language());
-                    exists = true;
-                    displayName = language + ' (' + engineDesc.get_longname() + ')';
-                    shortName = this._makeEngineShortName(engineDesc);
+
+                    info.exists = true;
+                    info.displayName = language + ' (' + engineDesc.get_longname() + ')';
+                    info.shortName = this._makeEngineShortName(engineDesc);
+                    info.ibusEngineId = id;
                 }
             }
 
-            if (!exists)
+            if (!info.exists)
                 continue;
 
-            let is = new InputSource(type, id, displayName, shortName, i);
+            info.sourceIndex = i;
 
-            is.connect('activate', Lang.bind(this, function() {
-                if (this._currentSource.index == is.index)
-                    return;
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(is.index));
-            }));
-
-            if (!(is.shortName in inputSourcesByShortName))
-                inputSourcesByShortName[is.shortName] = [];
-            inputSourcesByShortName[is.shortName].push(is);
-
-            this._inputSources[is.index] = is;
-
-            if (is.type == INPUT_SOURCE_TYPE_IBUS)
-                this._ibusSources[is.id] = is;
+            if (!(info.shortName in infosByShortName))
+                infosByShortName[info.shortName] = [];
+            infosByShortName[info.shortName].push(info);
+            infos.push(info);
         }
 
-        let menuIndex = 0;
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            if (inputSourcesByShortName[is.shortName].length > 1) {
-                let sub = inputSourcesByShortName[is.shortName].indexOf(is) + 1;
-                is.shortName += String.fromCharCode(0x2080 + sub);
+        for (let i = 0; i < infos.length; i++) {
+            let info = infos[i];
+            if (infosByShortName[info.shortName].length > 1) {
+                let sub = infosByShortName[info.shortName].indexOf(info) + 1;
+                info.shortName += String.fromCharCode(0x2080 + sub);
             }
 
-            this.menu.addMenuItem(is.menuItem, menuIndex++);
+            let item = new LayoutMenuItem(info.displayName, info.shortName);
+            item.ibusEngineId = info.ibusEngineId;
+            this._layoutItems[info.sourceIndex] = item;
+            this.menu.addMenuItem(item, i);
+            item.connect('activate', Lang.bind(this, function() {
+                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
+                                         GLib.Variant.new_uint32(info.sourceIndex));
+            }));
 
-            this._container.add_actor(is.indicatorLabel);
-            this._container.set_skip_paint(is.indicatorLabel, true);
+            let shortLabel = new St.Label({ text: info.shortName });
+            this._labelActors[info.sourceIndex] = shortLabel;
+            this._container.add_actor(shortLabel);
+            this._container.set_skip_paint(shortLabel, true);
         }
 
-        let sourcesList = [];
-        for (let i in this._inputSources)
-            sourcesList.push(this._inputSources[i]);
-
-        let mruSources = [];
-        for (let i = 0; i < this._mruSources.length; i++) {
-            for (let j = 0; j < sourcesList.length; j++)
-                if (this._mruSources[i].type == sourcesList[j].type &&
-                    this._mruSources[i].id == sourcesList[j].id) {
-                    mruSources = mruSources.concat(sourcesList.splice(j, 1));
-                    break;
-                }
-        }
-        this._mruSources = mruSources.concat(sourcesList);
-
         this._currentInputSourceChanged();
     },
 
     _showLayout: function() {
         Main.overview.hide();
 
-        let source = this._currentSource;
+        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
+        let current = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
+        let [type, id] = sources.get_child_value(current).deep_unpack();
         let xkbLayout = '';
         let xkbVariant = '';
 
-        if (source.type == INPUT_SOURCE_TYPE_XKB) {
-            [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(source.id);
-        } else if (source.type == INPUT_SOURCE_TYPE_IBUS) {
-            let engineDesc = this._ibusManager.getEngineDesc(source.id);
+        if (type == INPUT_SOURCE_TYPE_XKB) {
+            [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(id);
+        } else if (type == INPUT_SOURCE_TYPE_IBUS) {
+            let engineDesc = this._ibusManager.getEngineDesc(id);
             if (engineDesc) {
                 xkbLayout = engineDesc.get_layout();
                 xkbVariant = '';
@@ -566,25 +394,26 @@ const InputSourceIndicator = new Lang.Class({
         return String.fromCharCode(0x2328); // keyboard glyph
     },
 
-    _ibusPropertiesRegistered: function(im, engineName, props) {
-        let source = this._ibusSources[engineName];
-        if (!source)
-            return;
-
-        source.properties = props;
-
-        if (source == this._currentSource)
-            this._currentInputSourceChanged();
+    _propertyWhitelisted: function(prop) {
+        for (let i = 0; i < this._propertiesWhitelist.length; ++i) {
+            let key = prop.get_key();
+            if (key.substr(0, this._propertiesWhitelist[i].length) == this._propertiesWhitelist[i])
+                return true;
+        }
+        return false;
     },
 
-    _ibusPropertyUpdated: function(im, engineName, prop) {
-        let source = this._ibusSources[engineName];
-        if (!source)
+    _ibusPropertiesRegistered: function(im, props) {
+        this._properties = props;
+        this._buildPropSection();
+    },
+
+    _ibusPropertyUpdated: function(im, prop) {
+        if (!this._propertyWhitelisted(prop))
             return;
 
-        if (this._updateSubProperty(source.properties, prop) &&
-            source == this._currentSource)
-            this._currentInputSourceChanged();
+        if (this._updateSubProperty(this._properties, prop))
+            this._buildPropSection();
     },
 
     _updateSubProperty: function(props, prop) {
@@ -604,12 +433,25 @@ const InputSourceIndicator = new Lang.Class({
         return false;
     },
 
-    _buildPropSection: function(properties) {
+    _updateIndicatorLabel: function(text) {
+        let layoutItem = this._layoutItems[this._currentSourceIndex];
+        let hasProperties;
+
+        if (layoutItem)
+            hasProperties = this._ibusManager.hasProperties(layoutItem.ibusEngineId);
+        else
+            hasProperties = false;
+
+        if (hasProperties)
+            this._labelActors[this._currentSourceIndex].set_text(text);
+    },
+
+    _buildPropSection: function() {
         this._propSeparator.actor.hide();
         this._propSection.actor.hide();
         this._propSection.removeAll();
 
-        this._buildPropSubMenu(this._propSection, properties);
+        this._buildPropSubMenu(this._propSection, this._properties);
 
         if (!this._propSection.isEmpty()) {
             this._propSection.actor.show();
@@ -626,7 +468,8 @@ const InputSourceIndicator = new Lang.Class({
         for (let i = 0; (p = props.get(i)) != null; ++i) {
             let prop = p;
 
-            if (!prop.get_visible())
+            if (!this._propertyWhitelisted(prop) ||
+                !prop.get_visible())
                 continue;
 
             if (prop.get_key() == 'InputMode') {
@@ -637,17 +480,15 @@ const InputSourceIndicator = new Lang.Class({
                     text = prop.get_label().get_text();
 
                 if (text && text.length > 0 && text.length < 3)
-                    this._currentSource.indicatorLabel.set_text(text);
+                    this._updateIndicatorLabel(text);
             }
 
             let item;
-            switch (prop.get_prop_type()) {
-            case IBus.PropType.MENU:
+            let type = prop.get_prop_type();
+            if (type == IBus.PropType.MENU) {
                 item = new PopupMenu.PopupSubMenuMenuItem(prop.get_label().get_text());
                 this._buildPropSubMenu(item.menu, prop.get_sub_props());
-                break;
-
-            case IBus.PropType.RADIO:
+            } else if (type == IBus.PropType.RADIO) {
                 item = new PopupMenu.PopupMenuItem(prop.get_label().get_text());
                 item.prop = prop;
                 radioGroup.push(item);
@@ -672,39 +513,7 @@ const InputSourceIndicator = new Lang.Class({
                         }
                     }
                 }));
-                break;
-
-            case IBus.PropType.TOGGLE:
-                item = new PopupMenu.PopupSwitchMenuItem(prop.get_label().get_text(), prop.get_state() == IBus.PropState.CHECKED);
-                item.prop = prop;
-                item.connect('toggled', Lang.bind(this, function() {
-                    if (item.state) {
-                        item.prop.set_state(IBus.PropState.CHECKED);
-                        this._ibusManager.activateProperty(item.prop.get_key(),
-                                                           IBus.PropState.CHECKED);
-                    } else {
-                        item.prop.set_state(IBus.PropState.UNCHECKED);
-                        this._ibusManager.activateProperty(item.prop.get_key(),
-                                                           IBus.PropState.UNCHECKED);
-                    }
-                }));
-                break;
-
-            case IBus.PropType.NORMAL:
-                item = new PopupMenu.PopupMenuItem(prop.get_label().get_text());
-                item.prop = prop;
-                item.connect('activate', Lang.bind(this, function() {
-                    this._ibusManager.activateProperty(item.prop.get_key(),
-                                                       IBus.PropState.CHECKED);
-                }));
-                break;
-
-            case IBus.PropType.SEPARATOR:
-                item = new PopupMenu.PopupSeparatorMenuItem();
-                break;
-
-            default:
-                log ('IBus property %s has invalid type %d'.format(prop.get_key(), type));
+            } else {
                 continue;
             }
 
@@ -713,91 +522,14 @@ const InputSourceIndicator = new Lang.Class({
         }
     },
 
-    _getNewInputSource: function(current) {
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            if (is.type == current.type &&
-                is.id == current.id)
-                return is;
-        }
-        return this._currentSource;
-    },
-
-    _getCurrentWindow: function() {
-        if (Main.overview.visible)
-            return Main.overview;
-        else
-            return global.display.focus_window;
-    },
-
-    _setPerWindowInputSource: function() {
-        let window = this._getCurrentWindow();
-        if (!window)
-            return;
-
-        if (!window._inputSources) {
-            window._inputSources = this._inputSources;
-            window._currentSource = this._currentSource;
-        } else if (window._inputSources == this._inputSources) {
-            window._currentSource.activate();
-        } else {
-            window._inputSources = this._inputSources;
-            window._currentSource = this._getNewInputSource(window._currentSource);
-            window._currentSource.activate();
-        }
-    },
-
-    _sourcesPerWindowChanged: function() {
-        this._sourcesPerWindow = this._settings.get_boolean('per-window');
-
-        if (this._sourcesPerWindow && this._focusWindowNotifyId == 0) {
-            this._focusWindowNotifyId = global.display.connect('notify::focus-window',
-                                                               Lang.bind(this, this._setPerWindowInputSource));
-            this._overviewShowingId = Main.overview.connect('showing',
-                                                            Lang.bind(this, this._setPerWindowInputSource));
-            this._overviewHiddenId = Main.overview.connect('hidden',
-                                                           Lang.bind(this, this._setPerWindowInputSource));
-        } else if (!this._sourcesPerWindow && this._focusWindowNotifyId != 0) {
-            global.display.disconnect(this._focusWindowNotifyId);
-            this._focusWindowNotifyId = 0;
-            Main.overview.disconnect(this._overviewShowingId);
-            this._overviewShowingId = 0;
-            Main.overview.disconnect(this._overviewHiddenId);
-            this._overviewHiddenId = 0;
-
-            let windows = global.get_window_actors().map(function(w) {
-                return w.meta_window;
-            });
-            for (let i = 0; i < windows.length; ++i) {
-                delete windows[i]._inputSources;
-                delete windows[i]._currentSource;
-            }
-            delete Main.overview._inputSources;
-            delete Main.overview._currentSource;
-        }
-    },
-
-    _changePerWindowSource: function() {
-        if (!this._sourcesPerWindow)
-            return;
-
-        let window = this._getCurrentWindow();
-        if (!window)
-            return;
-
-        window._inputSources = this._inputSources;
-        window._currentSource = this._currentSource;
-    },
-
     _containerGetPreferredWidth: function(container, for_height, alloc) {
         // Here, and in _containerGetPreferredHeight, we need to query
         // for the height of all children, but we ignore the results
         // for those we don't actually display.
         let max_min_width = 0, max_natural_width = 0;
 
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            let [min_width, natural_width] = is.indicatorLabel.get_preferred_width(for_height);
+        for (let i in this._labelActors) {
+            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
             max_min_width = Math.max(max_min_width, min_width);
             max_natural_width = Math.max(max_natural_width, natural_width);
         }
@@ -809,9 +541,8 @@ const InputSourceIndicator = new Lang.Class({
     _containerGetPreferredHeight: function(container, for_width, alloc) {
         let max_min_height = 0, max_natural_height = 0;
 
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            let [min_height, natural_height] = is.indicatorLabel.get_preferred_height(for_width);
+        for (let i in this._labelActors) {
+            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
             max_min_height = Math.max(max_min_height, min_height);
             max_natural_height = Math.max(max_natural_height, natural_height);
         }
@@ -827,9 +558,7 @@ const InputSourceIndicator = new Lang.Class({
         box.y2 -= box.y1;
         box.y1 = 0;
 
-        for (let i in this._inputSources) {
-            let is = this._inputSources[i];
-            is.indicatorLabel.allocate_align_fill(box, 0.5, 0, false, false, flags);
-        }
+        for (let i in this._labelActors)
+            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
     }
 });

js/ui/status/lockScreenMenu.js

@@ -10,53 +10,48 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const VolumeMenu = imports.ui.status.volume;
 
-const FakeStatusIcon = new Lang.Class({
-    Name: 'FakeStatusIcon',
-
-    _init: function(button) {
-        this.actor = new St.BoxLayout({ style_class: 'panel-status-button-box' });
-        this._button = button;
-        this._button.connect('icons-updated', Lang.bind(this, this._reconstructIcons));
-        this._button.actor.bind_property('visible', this.actor, 'visible',
-                                         GObject.BindingFlags.SYNC_CREATE);
-        this._reconstructIcons();
-    },
-
-    _reconstructIcons: function() {
-        this.actor.destroy_all_children();
-        this._button.icons.forEach(Lang.bind(this, function(icon) {
-            let newIcon = new St.Icon({ style_class: 'system-status-icon' });
-            icon.bind_property('gicon', newIcon, 'gicon',
-                               GObject.BindingFlags.SYNC_CREATE);
-            icon.bind_property('visible', newIcon, 'visible',
-                               GObject.BindingFlags.SYNC_CREATE);
-            this.actor.add_actor(newIcon);
-        }));
-    }
-});
-
 const Indicator = new Lang.Class({
     Name: 'LockScreenMenuIndicator',
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
         this.parent(null, _("Volume, network, battery"));
-        this._box.style_class = 'lock-screen-status-button-box';
 
-        this._volumeControl = VolumeMenu.getMixerControl();
-        this._volumeMenu = new VolumeMenu.VolumeMenu(this._volumeControl);
-        this.menu.addMenuItem(this._volumeMenu);
+        this._volume = Main.panel.statusArea.volume;
+        if (this._volume) {
+            this._volumeIcon = this.addIcon(null);
+            this._volume.mainIcon.bind_property('gicon', this._volumeIcon, 'gicon',
+                                                GObject.BindingFlags.SYNC_CREATE);
+            this._volume.mainIcon.bind_property('visible', this._volumeIcon, 'visible',
+                                                GObject.BindingFlags.SYNC_CREATE);
 
-        this._volume = new FakeStatusIcon(Main.panel.statusArea.volume);
-        this._box.add_child(this._volume.actor);
-
-        // Network may not exist if the user doesn't have NetworkManager
-        if (Main.panel.statusArea.network) {
-            this._network = new FakeStatusIcon(Main.panel.statusArea.network);
-            this._box.add_child(this._network.actor);
+            this._volumeControl = VolumeMenu.getMixerControl();
+            this._volumeMenu = new VolumeMenu.VolumeMenu(this._volumeControl);
+            this.menu.addMenuItem(this._volumeMenu);
         }
 
-        this._battery = new FakeStatusIcon(Main.panel.statusArea.battery);
-        this._box.add_child(this._battery.actor);
+        this._network = Main.panel.statusArea.network;
+        if (this._network) {
+            this._networkIcon = this.addIcon(null);
+            this._network.mainIcon.bind_property('gicon', this._networkIcon, 'gicon',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+            this._network.mainIcon.bind_property('visible', this._networkIcon, 'visible',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+
+            this._networkSecondaryIcon = this.addIcon(null);
+            this._network.secondaryIcon.bind_property('gicon', this._networkSecondaryIcon, 'gicon',
+                                                      GObject.BindingFlags.SYNC_CREATE);
+            this._network.secondaryIcon.bind_property('visible', this._networkSecondaryIcon, 'visible',
+                                                      GObject.BindingFlags.SYNC_CREATE);
+        }
+
+        this._battery = Main.panel.statusArea.battery;
+        if (this._battery) {
+            this._batteryIcon = this.addIcon(null);
+            this._battery.mainIcon.bind_property('gicon', this._batteryIcon, 'gicon',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+            this._battery.mainIcon.bind_property('visible', this._batteryIcon, 'visible',
+                                                 GObject.BindingFlags.SYNC_CREATE);
+        }
     }
 });

js/ui/status/network.js

@@ -8,14 +8,6 @@ const NMClient = imports.gi.NMClient;
 const Signals = imports.signals;
 const St = imports.gi.St;
 
-// Some of the new code depends on as-yet-unreleased NM
-var NMGtk;
-try {
-    NMGtk = imports.gi.NMGtk;
-} catch(e) {
-    NMGtk = null;
-}
-
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -147,6 +139,46 @@ const NMNetworkMenuItem = new Lang.Class({
     }
 });
 
+const NMWiredSectionTitleMenuItem = new Lang.Class({
+    Name: 'NMWiredSectionTitleMenuItem',
+    Extends: PopupMenu.PopupSwitchMenuItem,
+
+    _init: function(label, params) {
+        params = params || { };
+        params.style_class = 'popup-subtitle-menu-item';
+        this.parent(label, false, params);
+    },
+
+    updateForDevice: function(device) {
+        if (device) {
+            this._device = device;
+            this.setStatus(device.getStatusLabel());
+            this.setToggleState(device.connected);
+        } else
+            this.setStatus('');
+    },
+
+    activate: function(event) {
+        this.parent(event);
+
+        if (!this._device) {
+            log('Section title activated when there is more than one device, should be non reactive');
+            return;
+        }
+
+        let newState = this._switch.state;
+
+        let ok;
+        if (newState)
+            ok = this._device.activate();
+        else
+            ok = this._device.deactivate();
+
+        if (!ok)
+            this._switch.setToggleState(false);
+    }
+});
+
 const NMWirelessSectionTitleMenuItem = new Lang.Class({
     Name: 'NMWirelessSectionTitleMenuItem',
     Extends: PopupMenu.PopupSwitchMenuItem,
@@ -201,11 +233,20 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
     }
 });
 
-const NMConnectionBased = new Lang.Class({
-    Name: 'NMConnectionBased',
+const NMDevice = new Lang.Class({
+    Name: 'NMDevice',
     Abstract: true,
 
-    _init: function(connections) {
+    _init: function(client, device, connections) {
+        this.device = device;
+        if (device) {
+            this.device._delegate = this;
+            this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
+        } else
+            this._stateChangedId = 0;
+
+        // protected
+        this._client = client;
         this._connections = [ ];
         for (let i = 0; i < connections.length; i++) {
             if (!connections[i].get_uuid())
@@ -223,115 +264,26 @@ const NMConnectionBased = new Lang.Class({
             this._connections.push(obj);
         }
         this._connections.sort(this._connectionSortFunction);
-    },
-
-    checkConnection: function(connection) {
-        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];
-
-            // 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.get_id(),
-            uuid: connection.get_uuid(),
-            timestamp: connection._timestamp,
-            item: null,
-        };
-        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
-
-        this._queueCreateSection();
-    },
-
-    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
-        if (pos == -1) {
-            // this connection was never added, nothing to do here
-            return;
-        }
-
-        let obj = this._connections[pos];
-        if (obj.item)
-            obj.item.destroy();
-        this._connections.splice(pos, 1);
-
-        if (this._connections.length <= 1) {
-            // We need to show the automatic connection again
-            // (or in the case of NMDeviceWired, we want to hide
-            // the only explicit connection)
-            this._queueCreateSection();
-        }
-    },
-
-    _findConnection: function(uuid) {
-        for (let i = 0; i < this._connections.length; i++) {
-            let obj = this._connections[i];
-            if (obj.uuid == uuid)
-                return i;
-        }
-        return -1;
-    },
-
-    _connectionSortFunction: function(one, two) {
-        if (one.timestamp == two.timestamp)
-            return GLib.utf8_collate(one.name, two.name);
-
-        return two.timestamp - one.timestamp;
-    },
-});
-Signals.addSignalMethods(NMConnectionBased.prototype);
-
-const NMDevice = new Lang.Class({
-    Name: 'NMDevice',
-    Abstract: true,
-    Extends: NMConnectionBased,
-
-    _init: function(client, device, connections) {
-        this.device = device;
-        this.device._delegate = this;
-        this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
-
-        // protected
-        this._client = client;
-        this.parent(connections);
         this._activeConnection = null;
         this._activeConnectionItem = null;
         this._autoConnectionItem = null;
         this._overflowItem = null;
 
-        this.statusItem = new PopupMenu.PopupSwitchMenuItem('', this.connected, { style_class: 'popup-subtitle-menu-item' });
-        this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
-            let ok;
-            if (state)
-                ok = this.activate();
-            else
-                ok = this.deactivate();
+        if (this.device) {
+            this.statusItem = new PopupMenu.PopupSwitchMenuItem(this._getDescription(), this.connected, { style_class: 'popup-subtitle-menu-item' });
+            this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
+                let ok;
+                if (state)
+                    ok = this.activate();
+                else
+                    ok = this.deactivate();
 
-            if (!ok)
-                item.setToggleState(!state);
-        }));
+                if (!ok)
+                    item.setToggleState(!state);
+            }));
 
-        this._updateStatusItem();
+            this._updateStatusItem();
+        }
         this.section = new PopupMenu.PopupMenuSection();
 
         this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
@@ -400,10 +352,6 @@ const NMDevice = new Lang.Class({
         return this.device.state == NetworkManager.DeviceState.ACTIVATED;
     },
 
-    clearActiveConnection: function(activeConnection) {
-        this.setActiveConnection(null);
-    },
-
     setActiveConnection: function(activeConnection) {
         if (activeConnection == this._activeConnection)
             // nothing to do
@@ -421,13 +369,80 @@ const NMDevice = new Lang.Class({
         this._queueCreateSection();
     },
 
+    checkConnection: function(connection) {
+        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];
+
+            // 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.get_id(),
+            uuid: connection.get_uuid(),
+            timestamp: connection._timestamp,
+            item: null,
+        };
+        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
+
+        this._clearSection();
+        this._queueCreateSection();
+    },
+
+    removeConnection: function(connection) {
+        let pos = this._findConnection(connection.get_uuid());
+        if (pos == -1) {
+            // this connection was never added, nothing to do here
+            return;
+        }
+
+        let obj = this._connections[pos];
+        if (obj.item)
+            obj.item.destroy();
+        this._connections.splice(pos, 1);
+
+        if (this._connections.length <= 1) {
+            // We need to show the automatic connection again
+            // (or in the case of NMDeviceWired, we want to hide
+            // the only explicit connection)
+            this._clearSection();
+            this._queueCreateSection();
+        }
+    },
+
     connectionValid: function(connection) {
         return this.device.connection_valid(connection);
     },
 
+    _connectionSortFunction: function(one, two) {
+        if (one.timestamp == two.timestamp)
+            return GLib.utf8_collate(one.name, two.name);
+
+        return two.timestamp - one.timestamp;
+    },
+
     setEnabled: function(enabled) {
         // do nothing by default, we want to keep the conneciton list visible
-        // in the majority of cases (wired, wwan)
+        // in the majority of cases (wired, wwan, vpn)
     },
 
     getStatusLabel: function() {
@@ -480,16 +495,20 @@ const NMDevice = new Lang.Class({
         }
     },
 
-    syncDescription: function() {
-        if (this.device._description)
-            this.statusItem.label.text = this.device._description;
-    },
-
     // protected
     _createAutomaticConnection: function() {
         throw new TypeError('Invoking pure virtual function NMDevice.createAutomaticConnection');
     },
 
+    _findConnection: function(uuid) {
+        for (let i = 0; i < this._connections.length; i++) {
+            let obj = this._connections[i];
+            if (obj.uuid == uuid)
+                return i;
+        }
+        return -1;
+    },
+
     _queueCreateSection: function() {
         this._clearSection();
         Main.queueDeferredWork(this._deferredWorkId);
@@ -582,11 +601,7 @@ const NMDevice = new Lang.Class({
             this.emit('network-lost');
         }
 
-        /* Emit a notification if activation fails, but don't do it
-           if the reason is no secrets, as that indicates the user
-           cancelled the agent dialog */
-        if (newstate == NetworkManager.DeviceState.FAILED &&
-            reason != NetworkManager.DeviceStateReason.NO_SECRETS) {
+        if (newstate == NetworkManager.DeviceState.FAILED) {
             this.emit('activation-failed', reason);
         }
 
@@ -616,14 +631,36 @@ const NMDevice = new Lang.Class({
         this.statusItem.setStatus(this.getStatusLabel());
 
         this.emit('state-changed');
+    },
+
+    _getDescription: function() {
+        let dev_product = this.device.get_product();
+        let dev_vendor = this.device.get_vendor();
+        if (!dev_product || !dev_vendor)
+	    return '';
+
+        let product = Util.fixupPCIDescription(dev_product);
+        let vendor = Util.fixupPCIDescription(dev_vendor);
+        let out = '';
+
+        // Another quick hack; if all of the fixed up vendor string
+        // is found in product, ignore the vendor.
+        if (product.indexOf(vendor) == -1)
+            out += vendor + ' ';
+        out += product;
+
+        return out;
     }
 });
+Signals.addSignalMethods(NMDevice.prototype);
 
-const NMDeviceSimple = new Lang.Class({
-    Name: 'NMDeviceSimple',
+
+const NMDeviceWired = new Lang.Class({
+    Name: 'NMDeviceWired',
     Extends: NMDevice,
 
     _init: function(client, device, connections) {
+        this._autoConnectionName = _("Auto Ethernet");
         this.category = NMConnectionCategory.WIRED;
 
         this.parent(client, device, connections);
@@ -638,19 +675,6 @@ const NMDeviceSimple = new Lang.Class({
         // we can do it here because addConnection and removeConnection
         // both call _createSection at some point
         this.section.actor.visible = this._connections.length > 1;
-    }
-});
-
-const NMDeviceWired = new Lang.Class({
-    Name: 'NMDeviceWired',
-    Extends: NMDeviceSimple,
-
-    _init: function(client, device, connections) {
-        device._description = _("Wired");
-        this._autoConnectionName = _("Auto Ethernet");
-        this.category = NMConnectionCategory.WIRED;
-
-        this.parent(client, device, connections);
     },
 
     _createAutomaticConnection: function() {
@@ -674,7 +698,6 @@ const NMDeviceModem = new Lang.Class({
     _init: function(client, device, connections) {
         let is_wwan = false;
 
-        device._description = _("Mobile broadband");
         this._enabled = true;
         this.mobileDevice = null;
         this._connectionType = 'ppp';
@@ -793,7 +816,6 @@ const NMDeviceBluetooth = new Lang.Class({
     Extends: NMDevice,
 
     _init: function(client, device, connections) {
-        device._description = _("Bluetooth");
         this._autoConnectionName = this._makeConnectionName(device);
         device.connect('notify::name', Lang.bind(this, this._updateAutoConnectionName));
 
@@ -839,6 +861,99 @@ const NMDeviceBluetooth = new Lang.Class({
         this._clearSection();
         this._queueCreateSection();
         this._updateStatusItem();
+    },
+
+    _getDescription: function() {
+        return this.device.name || _("Bluetooth");
+    }
+});
+
+
+// Not a real device, but I save a lot code this way
+const NMDeviceVPN = new Lang.Class({
+    Name: 'NMDeviceVPN',
+    Extends: NMDevice,
+
+    _init: function(client, device, connections) {
+        // Disable autoconnections
+        this._autoConnectionName = null;
+        this.category = NMConnectionCategory.VPN;
+
+        this.parent(client, null, connections);
+    },
+
+    connectionValid: function(connection) {
+        return connection._type == NetworkManager.SETTING_VPN_SETTING_NAME;
+    },
+
+    get empty() {
+        return this._connections.length == 0;
+    },
+
+    get connected() {
+        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);
+
+        if (this._activeConnection)
+            this._stateChangeId = this._activeConnection.connect('vpn-state-changed',
+                                                                 Lang.bind(this, this._connectionStateChanged));
+
+        this.emit('state-changed');
+    },
+
+    _shouldShowConnectionList: function() {
+        return true;
+    },
+
+    deactivate: function() {
+        if (this._activeConnection)
+            this._client.deactivate_connection(this._activeConnection);
+    },
+
+    getStatusLabel: function() {
+        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');
     }
 });
 
@@ -1442,152 +1557,6 @@ const NMDeviceWireless = new Lang.Class({
     },
 });
 
-const NMVPNSection = new Lang.Class({
-    Name: 'NMVPNSection',
-    Extends: NMConnectionBased,
-    category: NMConnectionCategory.VPN,
-
-    _init: function(client, connections) {
-        this.parent(connections);
-        this._client = client;
-
-        this.section = new PopupMenu.PopupMenuSection();
-        this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
-    },
-
-    get empty() {
-        return this._connections.length == 0;
-    },
-
-    connectionValid: function(connection) {
-        // filtering is done by NMApplet code
-        return true;
-    },
-
-    getStatusLabel: function(activeConnection) {
-        switch(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';
-        }
-    },
-
-    clearActiveConnection: function(activeConnection) {
-        let pos = this._findConnection(activeConnection.uuid);
-        if (pos < 0)
-            return;
-
-        let obj = this._connections[pos];
-        obj.active.disconnect(obj.stateChangedId);
-        obj.active = null;
-
-        if (obj.item) {
-            obj.item.setToggleState(false);
-            obj.item.setStatus(null);
-        }
-    },
-
-    setActiveConnection: function(activeConnection) {
-        let pos = this._findConnection(activeConnection.uuid);
-        if (pos < 0)
-            return;
-
-        let obj = this._connections[pos];
-        obj.active = activeConnection;
-        obj.stateChangedId = obj.active.connect('vpn-state-changed',
-                                                Lang.bind(this, this._connectionStateChanged));
-
-        if (obj.item) {
-            obj.item.setToggleState(obj.active.vpn_state ==
-                                    NetworkManager.VPNConnectionState.ACTIVATED);
-            obj.item.setStatus(this.getStatusLabel(obj.active));
-        }
-    },
-
-    _queueCreateSection: function() {
-        this.section.removeAll();
-        Main.queueDeferredWork(this._deferredWorkId);
-    },
-
-    _createConnectionItem: function(obj) {
-        let menuItem = new PopupMenu.PopupSwitchMenuItem(obj.name, false,
-                                                         { style_class: 'popup-subtitle-menu-item' });
-        menuItem.connect('toggled', Lang.bind(this, function(menuItem) {
-            if (menuItem.state) {
-                this._client.activate_connection(obj.connection, null, null, null);
-                // Immediately go back to disconnected, until NM tells us to change
-                menuItem.setToggleState(false);
-            } else if (obj.active) {
-                this._client.deactivate_connection(obj.active);
-            }
-        }));
-
-        if (obj.active) {
-            menuItem.setToggleState(obj.active.vpn_state ==
-                                    NetworkManager.VPNConnectionState.ACTIVATED);
-            menuItem.setStatus(this.getStatusLabel(obj.active));
-        }
-
-        return menuItem;
-    },
-
-    _createSection: function() {
-        if (this._connections.length > 0) {
-            this.section.actor.show();
-
-            for(let j = 0; j < this._connections.length; ++j) {
-                let obj = this._connections[j];
-                obj.item = this._createConnectionItem(obj);
-
-                if (j >= NUM_VISIBLE_NETWORKS) {
-                    if (!this._overflowItem) {
-                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-                        this.section.addMenuItem(this._overflowItem);
-                    }
-                    this._overflowItem.menu.addMenuItem(obj.item);
-                } else
-                    this.section.addMenuItem(obj.item);
-            }
-        } else {
-            this.section.actor.hide()
-        }
-    },
-
-    _connectionStateChanged: function(vpnConnection, newstate, reason) {
-        if (newstate == NetworkManager.VPNConnectionState.FAILED &&
-            reason != NetworkManager.VPNConnectionStateReason.NO_SECRETS) {
-            // 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);
-        }
-
-        let pos = this._findConnection(vpnConnection.uuid);
-        if (pos >= 0) {
-            let obj = this._connections[pos];
-            if (obj.item) {
-                obj.item.setToggleState(vpnConnection.vpn_state ==
-                                        NetworkManager.VPNConnectionState.ACTIVATED);
-                obj.item.setStatus(this.getStatusLabel(vpnConnection));
-            }
-        } else {
-            log('Could not find connection for vpn-state-changed handler');
-        }
-    },
-});
-
 const NMApplet = new Lang.Class({
     Name: 'NMApplet',
     Extends: PanelMenu.SystemStatusButton,
@@ -1620,14 +1589,15 @@ const NMApplet = new Lang.Class({
         this._mobileUpdateId = 0;
         this._mobileUpdateDevice = null;
 
-        this._nmDevices = [];
         this._devices = { };
 
         this._devices.wired = {
             section: new PopupMenu.PopupMenuSection(),
             devices: [ ],
+            item: new NMWiredSectionTitleMenuItem(_("Wired"))
         };
 
+        this._devices.wired.section.addMenuItem(this._devices.wired.item);
         this._devices.wired.section.actor.hide();
         this.menu.addMenuItem(this._devices.wired.section);
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -1635,7 +1605,7 @@ const NMApplet = new Lang.Class({
         this._devices.wireless = {
             section: new PopupMenu.PopupMenuSection(),
             devices: [ ],
-            item: this._makeToggleItem('wireless', _("Wi-Fi"))
+            item: this._makeToggleItem('wireless', _("Wireless"))
         };
         this._devices.wireless.section.addMenuItem(this._devices.wireless.item);
         this._devices.wireless.section.actor.hide();
@@ -1645,14 +1615,22 @@ const NMApplet = new Lang.Class({
         this._devices.wwan = {
             section: new PopupMenu.PopupMenuSection(),
             devices: [ ],
+            item: this._makeToggleItem('wwan', _("Mobile broadband"))
         };
+        this._devices.wwan.section.addMenuItem(this._devices.wwan.item);
         this._devices.wwan.section.actor.hide();
         this.menu.addMenuItem(this._devices.wwan.section);
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
-        this._vpnSection = new NMVPNSection(this._client, this._connections);
-        this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
-        this.menu.addMenuItem(this._vpnSection.section);
+        this._devices.vpn = {
+            section: new PopupMenu.PopupMenuSection(),
+            device: this._makeWrapperDevice(NMDeviceVPN, null),
+            item: new NMWiredSectionTitleMenuItem(_("VPN Connections"))
+        };
+        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();
+        this.menu.addMenuItem(this._devices.vpn.section);
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
 
@@ -1662,7 +1640,6 @@ const NMApplet = new Lang.Class({
         this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
         this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
         this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
-        this._dtypes[NetworkManager.DeviceType.INFINIBAND] = NMDeviceSimple;
         // TODO: WiMax support
 
         // Connection types
@@ -1674,7 +1651,6 @@ const NMApplet = new Lang.Class({
         this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
         this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
         this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_INFINIBAND_SETTING_NAME] = NMConnectionCategory.WIRED;
         this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
 
         this._settings = NMClient.RemoteSettings.new(null);
@@ -1723,6 +1699,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;
@@ -1730,23 +1718,16 @@ const NMApplet = new Lang.Class({
             section.actor.hide();
         else {
             section.actor.show();
-
-            // Sync the relation between the section title
-            // item (the one with the airplane mode switch)
-            // and the individual device switches
-            if (item) {
-                if (devices.length == 1) {
-                    let dev = devices[0];
-                    dev.statusItem.actor.hide();
-                    item.updateForDevice(dev);
-                } else {
-                    devices.forEach(function(dev) {
-                        dev.statusItem.actor.show();
-                    });
-
-                    // remove status text from the section title item
-                    item.updateForDevice(null);
-                }
+            if (devices.length == 1) {
+                let dev = devices[0];
+                dev.statusItem.actor.hide();
+                item.updateForDevice(dev);
+            } else {
+                devices.forEach(function(dev) {
+                    dev.statusItem.actor.show();
+                });
+                // remove status text from the section title item
+                item.updateForDevice(null);
             }
         }
     },
@@ -1754,9 +1735,8 @@ const NMApplet = new Lang.Class({
     _readDevices: function() {
         let devices = this._client.get_devices() || [ ];
         for (let i = 0; i < devices.length; ++i) {
-            this._deviceAdded(this._client, devices[i], true);
+            this._deviceAdded(this._client, devices[i]);
         }
-        this._syncDeviceNames();
     },
 
     _notifyForDevice: function(device, iconName, title, text, urgency) {
@@ -1767,9 +1747,10 @@ const NMApplet = new Lang.Class({
            or this._source will be cleared */
         this._ensureSource();
 
-        let gicon = new Gio.ThemedIcon({ name: iconName });
+        let icon = new St.Icon({ icon_name: iconName,
+                                 icon_size: MessageTray.NOTIFICATION_ICON_SIZE });
         device._notification = new MessageTray.Notification(this._source, title, text,
-                                                            { gicon: gicon });
+                                                            { icon: icon });
         device._notification.setUrgency(urgency);
         device._notification.setTransient(true);
         device._notification.connect('destroy', function() {
@@ -1778,20 +1759,17 @@ const NMApplet = new Lang.Class({
         this._source.notify(device._notification);
     },
 
-    _onActivationFailed: 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-symbolic',
-                              _("Connection failed"),
-                              _("Activation of network connection failed"),
-                              MessageTray.Urgency.HIGH);
-    },
-
     _makeWrapperDevice: function(wrapperClass, device) {
         let wrapper = new wrapperClass(this._client, device, this._connections);
 
-        wrapper._activationFailedId = wrapper.connect('activation-failed',
-                                                      Lang.bind(this, this._onActivationFailed));
+        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-symbolic',
+                                  _("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);
         }));
@@ -1804,23 +1782,7 @@ const NMApplet = new Lang.Class({
         return wrapper;
     },
 
-    _syncDeviceNames: function() {
-        if (NMGtk) {
-            let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
-            for (let i = 0; i < this._nmDevices.length; i++) {
-                let device = this._nmDevices[i];
-                device._description = names[i];
-                device._delegate.syncDescription();
-            }
-        } else {
-            for (let i = 0; i < this._nmDevices.length; i++) {
-                let device = this._nmDevices[i];
-                device._delegate.syncDescription();
-            }
-        }
-    },
-
-    _deviceAdded: function(client, device, skipSyncDeviceNames) {
+    _deviceAdded: function(client, device) {
         if (device._delegate) {
             // already seen, not adding again
             return;
@@ -1831,14 +1793,10 @@ const NMApplet = new Lang.Class({
             let section = this._devices[wrapper.category].section;
             let devices = this._devices[wrapper.category].devices;
 
-            section.addMenuItem(wrapper.statusItem);
-            section.addMenuItem(wrapper.section);
+            section.addMenuItem(wrapper.section, 1);
+            section.addMenuItem(wrapper.statusItem, 1);
             devices.push(wrapper);
 
-            this._nmDevices.push(device);
-            if (!skipSyncDeviceNames)
-                this._syncDeviceNames();
-
             this._syncSectionTitle(wrapper.category);
         }
     },
@@ -1856,10 +1814,6 @@ const NMApplet = new Lang.Class({
         let pos = devices.indexOf(wrapper);
         devices.splice(pos, 1);
 
-        pos = this._nmDevices.indexOf(device);
-        this._nmDevices.splice(pos, 1);
-        this._syncDeviceNames();
-
         this._syncSectionTitle(wrapper.category)
     },
 
@@ -1898,7 +1852,7 @@ const NMApplet = new Lang.Class({
         for (let i = 0; i < closedConnections.length; i++) {
             let active = closedConnections[i];
             if (active._primaryDevice) {
-                active._primaryDevice.clearActiveConnection(active);
+                active._primaryDevice.setActiveConnection(null);
                 active._primaryDevice = null;
             }
             if (active._inited) {
@@ -1965,7 +1919,7 @@ const NMApplet = new Lang.Class({
                         }
                     }
                 } else
-                    a._primaryDevice = this._vpnSection;
+                    a._primaryDevice = this._devices.vpn.device
 
                 if (a._primaryDevice)
                     a._primaryDevice.setActiveConnection(a);
@@ -2047,7 +2001,8 @@ const NMApplet = new Lang.Class({
         let section = connection._section;
 
         if (section == NMConnectionCategory.VPN) {
-            this._vpnSection.removeConnection(connection);
+            this._devices.vpn.device.removeConnection(connection);
+            this._syncSectionTitle(section);
         } else if (section != NMConnectionCategory.INVALID) {
             let devices = this._devices[section].devices;
             for (let i = 0; i < devices.length; i++)
@@ -2070,7 +2025,8 @@ const NMApplet = new Lang.Class({
         if (section == NMConnectionCategory.INVALID)
             return;
         if (section == NMConnectionCategory.VPN) {
-            this._vpnSection.checkConnection(connection);
+            this._devices.vpn.device.checkConnection(connection);
+            this._syncSectionTitle(section);
         } else {
             let devices = this._devices[section].devices;
             for (let i = 0; i < devices.length; i++) {
@@ -2096,6 +2052,7 @@ const NMApplet = new Lang.Class({
         this._syncSectionTitle(NMConnectionCategory.WIRED);
         this._syncSectionTitle(NMConnectionCategory.WIRELESS);
         this._syncSectionTitle(NMConnectionCategory.WWAN);
+        this._syncSectionTitle(NMConnectionCategory.VPN);
     },
 
     _syncNMState: function() {

js/ui/status/power.js

@@ -7,7 +7,7 @@ const St = imports.gi.St;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
-const BUS_NAME = 'org.gnome.SettingsDaemon.Power';
+const BUS_NAME = 'org.gnome.SettingsDaemon';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';
 
 const UPDeviceType = {
@@ -61,7 +61,7 @@ const Indicator = new Lang.Class({
         this._primaryDeviceId = null;
 
         this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
-        this._primaryPercentage = new St.Label({ style_class: 'popup-battery-percentage' });
+        this._primaryPercentage = new St.Label();
         this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
         this.menu.addMenuItem(this._batteryItem);
 
@@ -183,8 +183,7 @@ const DeviceItem = new Lang.Class({
         this._box.add_actor(this._label);
         this.addActor(this._box);
 
-        let percentLabel = new St.Label({ text: C_("percent of battery remaining", "%d%%").format(Math.round(percentage)),
-                                          style_class: 'popup-battery-percentage' });
+        let percentLabel = new St.Label({ text: C_("percent of battery remaining", "%d%%").format(Math.round(percentage)) });
         this.addActor(percentLabel, { align: St.Align.END });
         //FIXME: ideally we would like to expose this._label and percentLabel
         this.actor.label_actor = percentLabel;

js/ui/status/volume.js

@@ -2,10 +2,8 @@
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
-const Gio = imports.gi.Gio;
 const Gvc = imports.gi.Gvc;
 const St = imports.gi.St;
-const Signals = imports.signals;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -27,187 +25,122 @@ function getMixerControl() {
     return _mixerControl;
 }
 
-const StreamSlider = new Lang.Class({
-    Name: 'StreamSlider',
+const VolumeMenu = new Lang.Class({
+    Name: 'VolumeMenu',
+    Extends: PopupMenu.PopupMenuSection,
+
+    _init: function(control) {
+        this.parent();
 
-    _init: function(control, title) {
         this._control = control;
-
-        this.item = new PopupMenu.PopupMenuSection();
-
-        this._title = new PopupMenu.PopupMenuItem(title, { reactive: false });
-        this._slider = new PopupMenu.PopupSliderMenuItem(0);
-        this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged));
-        this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
-
-        this.item.addMenuItem(this._title);
-        this.item.addMenuItem(this._slider);
-
-        this._stream = null;
-        this._shouldShow = true;
-    },
-
-    get stream() {
-        return this._stream;
-    },
-
-    set stream(stream) {
-        if (this._stream) {
-            this._disconnectStream(this._stream);
-        }
-
-        this._stream = stream;
-
-        if (this._stream) {
-            this._connectStream(this._stream);
-            this._updateVolume();
-        } else {
-            this.emit('stream-updated');
-        }
-
-        this._updateVisibility();
-    },
-
-    _disconnectStream: function(stream) {
-        stream.disconnect(this._mutedChangedId);
-        this._mutedChangedId = 0;
-        stream.disconnect(this._volumeChangedId);
-        this._volumeChangedId = 0;
-    },
-
-    _connectStream: function(stream) {
-        this._mutedChangedId = stream.connect('notify::is-muted', Lang.bind(this, this._updateVolume));
-        this._volumeChangedId = stream.connect('notify::volume', Lang.bind(this, this._updateVolume));
-    },
-
-    _shouldBeVisible: function() {
-        return this._stream != null;
-    },
-
-    _updateVisibility: function() {
-        let visible = this._shouldBeVisible();
-        this._title.actor.visible = visible;
-        this._slider.actor.visible = visible;
-    },
-
-    scroll: function(event) {
-        this._slider.scroll(event);
-    },
-
-    setValue: function(value) {
-        // piggy-back off of sliderChanged
-        this._slider.setValue(value);
-    },
-
-    _sliderChanged: function(slider, value, property) {
-        if (!this._stream)
-            return;
-
-        let volume = value * this._control.get_vol_max_norm();
-        let prevMuted = this._stream.is_muted;
-        if (volume < 1) {
-            this._stream.volume = 0;
-            if (!prevMuted)
-                this._stream.change_is_muted(true);
-        } else {
-            this._stream.volume = volume;
-            if (prevMuted)
-                this._stream.change_is_muted(false);
-        }
-        this._stream.push_volume();
-    },
-
-    _notifyVolumeChange: function() {
-        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
-    },
-
-    _updateVolume: function() {
-        let muted = this._stream.is_muted;
-        this._slider.setValue(muted ? 0 : (this._stream.volume / this._control.get_vol_max_norm()));
-        this.emit('stream-updated');
-    },
-
-    getIcon: function() {
-        if (!this._stream)
-            return null;
-
-        let volume = this._stream.volume;
-        if (this._stream.is_muted || volume <= 0) {
-            return 'audio-volume-muted-symbolic';
-        } else {
-            let n = Math.floor(3 * volume / this._control.get_vol_max_norm()) + 1;
-            if (n < 2)
-                return 'audio-volume-low-symbolic';
-            if (n >= 3)
-                return 'audio-volume-high-symbolic';
-            return 'audio-volume-medium-symbolic';
-        }
-    }
-});
-Signals.addSignalMethods(StreamSlider.prototype);
-
-const OutputStreamSlider = new Lang.Class({
-    Name: 'OutputStreamSlider',
-    Extends: StreamSlider,
-
-    _connectStream: function(stream) {
-        this.parent(stream);
-        this._portChangedId = stream.connect('notify::port', Lang.bind(this, this._portChanged));
-        this._portChanged();
-    },
-
-    _findHeadphones: function(sink) {
-        // This only works for external headphones (e.g. bluetooth)
-        if (sink.get_form_factor() == 'headset' ||
-            sink.get_form_factor() == 'headphone')
-            return true;
-
-        // a bit hackish, but ALSA/PulseAudio have a number
-        // of different identifiers for headphones, and I could
-        // not find the complete list
-        let port = sink.get_port();
-        if (port)
-            return port.port.indexOf('headphone') >= 0;
-
-        return false;
-    },
-
-    _disconnectStream: function(stream) {
-        this.parent(stream);
-        stream.disconnect(this._portChangedId);
-        this._portChangedId = 0;
-    },
-
-    _portChanged: function() {
-        let hasHeadphones = this._findHeadphones(this._stream);
-        if (hasHeadphones != this._hasHeadphones) {
-            this._hasHeadphones = hasHeadphones;
-            this.emit('headphones-changed', this._hasHeadphones);
-        }
-    }
-});
-
-const InputStreamSlider = new Lang.Class({
-    Name: 'InputStreamSlider',
-    Extends: StreamSlider,
-
-    _init: function(control, title) {
-        this.parent(control, title);
+        this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
+        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
+        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
         this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
         this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
+        this._volumeMax = this._control.get_vol_max_norm();
+
+        this._output = null;
+        this._outputVolumeId = 0;
+        this._outputMutedId = 0;
+        /* Translators: This is the label for audio volume */
+        this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
+        this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
+        this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.addMenuItem(this._outputTitle);
+        this.addMenuItem(this._outputSlider);
+
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._input = null;
+        this._inputVolumeId = 0;
+        this._inputMutedId = 0;
+        this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false });
+        this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
+        this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.addMenuItem(this._inputTitle);
+        this.addMenuItem(this._inputSlider);
+
+        this._onControlStateChanged();
     },
 
-    _connectStream: function(stream) {
-        this.parent(stream);
-        this._maybeShowInput();
+    scroll: function(direction) {
+        let currentVolume = this._output.volume;
+
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            let prev_muted = this._output.is_muted;
+            this._output.volume = Math.max(0, currentVolume - this._volumeMax * VOLUME_ADJUSTMENT_STEP);
+            if (this._output.volume < 1) {
+                this._output.volume = 0;
+                if (!prev_muted)
+                    this._output.change_is_muted(true);
+            }
+            this._output.push_volume();
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._output.volume = Math.min(this._volumeMax, currentVolume + this._volumeMax * VOLUME_ADJUSTMENT_STEP);
+            this._output.change_is_muted(false);
+            this._output.push_volume();
+        }
+
+        this._notifyVolumeChange();
+    },
+
+    _onControlStateChanged: function() {
+        if (this._control.get_state() == Gvc.MixerControlState.READY) {
+            this._readOutput();
+            this._readInput();
+            this._maybeShowInput();
+        } else {
+            this.emit('icon-changed', null);
+        }
+    },
+
+    _readOutput: function() {
+        if (this._outputVolumeId) {
+            this._output.disconnect(this._outputVolumeId);
+            this._output.disconnect(this._outputMutedId);
+            this._outputVolumeId = 0;
+            this._outputMutedId = 0;
+        }
+        this._output = this._control.get_default_sink();
+        if (this._output) {
+            this._outputMutedId = this._output.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_output'));
+            this._outputVolumeId = this._output.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_output'));
+            this._mutedChanged (null, null, '_output');
+            this._volumeChanged (null, null, '_output');
+        } else {
+            this._outputSlider.setValue(0);
+            this.emit('icon-changed', 'audio-volume-muted-symbolic');
+        }
+    },
+
+    _readInput: function() {
+        if (this._inputVolumeId) {
+            this._input.disconnect(this._inputVolumeId);
+            this._input.disconnect(this._inputMutedId);
+            this._inputVolumeId = 0;
+            this._inputMutedId = 0;
+        }
+        this._input = this._control.get_default_source();
+        if (this._input) {
+            this._inputMutedId = this._input.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_input'));
+            this._inputVolumeId = this._input.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_input'));
+            this._mutedChanged (null, null, '_input');
+            this._volumeChanged (null, null, '_input');
+        } else {
+            this._inputTitle.actor.hide();
+            this._inputSlider.actor.hide();
+        }
     },
 
     _maybeShowInput: function() {
         // only show input widgets if any application is recording audio
         let showInput = false;
         let recordingApps = this._control.get_source_outputs();
-        if (this._stream && recordingApps) {
+        if (this._input && recordingApps) {
             for (let i = 0; i < recordingApps.length; i++) {
                 let outputStream = recordingApps[i];
                 let id = outputStream.get_application_id();
@@ -220,70 +153,63 @@ const InputStreamSlider = new Lang.Class({
             }
         }
 
-        this._showInput = showInput;
-        this._updateVisibility();
+        this._inputTitle.actor.visible = showInput;
+        this._inputSlider.actor.visible = showInput;
     },
 
-    _shouldBeVisible: function() {
-        return this.parent() && this._showInput;
-    }
-});
-
-const VolumeMenu = new Lang.Class({
-    Name: 'VolumeMenu',
-    Extends: PopupMenu.PopupMenuSection,
-
-    _init: function(control) {
-        this.parent();
-
-        this.hasHeadphones = false;
-
-        this._control = control;
-        this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
-        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
-        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
-
-        /* Translators: This is the label for audio volume */
-        this._output = new OutputStreamSlider(this._control, _("Volume"));
-        this._output.connect('stream-updated', Lang.bind(this, function() {
-            this.emit('icon-changed');
-        }));
-        this._output.connect('headphones-changed', Lang.bind(this, function(stream, value) {
-            this.emit('headphones-changed', value);
-        }));
-        this.addMenuItem(this._output.item);
-
-        this._input = new InputStreamSlider(this._control, _("Microphone"));
-        this.addMenuItem(this._input.item);
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._onControlStateChanged();
-    },
-
-    scroll: function(event) {
-        this._output.scroll(event);
-    },
-
-    _onControlStateChanged: function() {
-        if (this._control.get_state() == Gvc.MixerControlState.READY) {
-            this._readInput();
-            this._readOutput();
+    _volumeToIcon: function(volume) {
+        if (volume <= 0) {
+            return 'audio-volume-muted-symbolic';
         } else {
-            this.emit('icon-changed');
+            let n = Math.floor(3 * volume / this._volumeMax) + 1;
+            if (n < 2)
+                return 'audio-volume-low-symbolic';
+            if (n >= 3)
+                return 'audio-volume-high-symbolic';
+            return 'audio-volume-medium-symbolic';
         }
     },
 
-    _readOutput: function() {
-        this._output.stream = this._control.get_default_sink();
+    _sliderChanged: function(slider, value, property) {
+        if (this[property] == null) {
+            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        let volume = value * this._volumeMax;
+        let prev_muted = this[property].is_muted;
+        if (volume < 1) {
+            this[property].volume = 0;
+            if (!prev_muted)
+                this[property].change_is_muted(true);
+        } else {
+            this[property].volume = volume;
+            if (prev_muted)
+                this[property].change_is_muted(false);
+        }
+        this[property].push_volume();
     },
 
-    _readInput: function() {
-        this._input.stream = this._control.get_default_source();
+    _notifyVolumeChange: function() {
+        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
+        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
     },
 
-    getIcon: function() {
-        return this._output.getIcon();
+    _mutedChanged: function(object, param_spec, property) {
+        let muted = this[property].is_muted;
+        let slider = this[property+'Slider'];
+        slider.setValue(muted ? 0 : (this[property].volume / this._volumeMax));
+        if (property == '_output') {
+            if (muted)
+                this.emit('icon-changed', 'audio-volume-muted-symbolic');
+            else
+                this.emit('icon-changed', this._volumeToIcon(this._output.volume));
+        }
+    },
+
+    _volumeChanged: function(object, param_spec, property) {
+        this[property+'Slider'].setValue(this[property].volume / this._volumeMax);
+        if (property == '_output' && !this._output.is_muted)
+            this.emit('icon-changed', this._volumeToIcon(this._output.volume));
     }
 });
 
@@ -296,17 +222,11 @@ const Indicator = new Lang.Class({
 
         this._control = getMixerControl();
         this._volumeMenu = new VolumeMenu(this._control);
-        this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu) {
-            let icon = this._volumeMenu.getIcon();
-            this.actor.visible = (icon != null);
+        this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) {
+            this._hasPulseAudio = (icon != null);
             this.setIcon(icon);
+            this._syncVisibility();
         }));
-        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) {
-            this._headphoneIcon.visible = value;
-        }));
-
-        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));
-        this._headphoneIcon.visible = false;
 
         this.menu.addMenuItem(this._volumeMenu);
 
@@ -316,7 +236,12 @@ const Indicator = new Lang.Class({
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
     },
 
+    _syncVisibility: function() {
+        this.actor.visible = this._hasPulseAudio;
+        this.mainIcon.visible = this._hasPulseAudio;
+    },
+
     _onScrollEvent: function(actor, event) {
-        this._volumeMenu.scroll(event);
+        this._volumeMenu.scroll(event.get_scroll_direction());
     }
 });

js/ui/switcherPopup.js

@@ -1,642 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const POPUP_DELAY_TIMEOUT = 150; // milliseconds
-
-const POPUP_SCROLL_TIME = 0.10; // seconds
-const POPUP_FADE_OUT_TIME = 0.1; // seconds
-
-const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
-
-function mod(a, b) {
-    return (a + b) % b;
-}
-
-function primaryModifier(mask) {
-    if (mask == 0)
-        return 0;
-
-    let primary = 1;
-    while (mask > 1) {
-        mask >>= 1;
-        primary <<= 1;
-    }
-    return primary;
-}
-
-const SwitcherPopup = new Lang.Class({
-    Name: 'SwitcherPopup',
-    Abstract: true,
-
-    _init: function(items) {
-        this._switcherList = null;
-
-        this._items = items || [];
-        this._selectedIndex = 0;
-
-        this.actor = new Shell.GenericContainer({ style_class: 'switcher-popup',
-                                                  reactive: true });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        Main.uiGroup.add_actor(this.actor);
-
-        this._haveModal = false;
-        this._modifierMask = 0;
-
-        this._motionTimeoutId = 0;
-        this._initialDelayTimeoutId = 0;
-
-        // Initially disable hover so we ignore the enter-event if
-        // the switcher appears underneath the current pointer location
-        this._disableHover();
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-
-        alloc.min_size = primary.width;
-        alloc.natural_size = primary.width;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-
-        alloc.min_size = primary.height;
-        alloc.natural_size = primary.height;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let primary = Main.layoutManager.primaryMonitor;
-
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-        let vPadding = this.actor.get_theme_node().get_vertical_padding();
-        let hPadding = leftPadding + rightPadding;
-
-        // Allocate the switcherList
-        // We select a size based on an icon size that does not overflow the screen
-        let [childMinHeight, childNaturalHeight] = this._switcherList.actor.get_preferred_height(primary.width - hPadding);
-        let [childMinWidth, childNaturalWidth] = this._switcherList.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(primary.x + primary.width - rightPadding, childBox.x1 + childNaturalWidth);
-        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
-        childBox.y2 = childBox.y1 + childNaturalHeight;
-        this._switcherList.actor.allocate(childBox, flags);
-    },
-
-    _createSwitcher: function() {
-        throw new Error('Not implemented');
-    },
-
-    _initialSelection: function(backward, binding) {
-        throw new Error('Not implemented');
-    },
-
-    show: function(backward, binding, mask) {
-        if (!this._createSwitcher())
-            return false;
-
-        if (!Main.pushModal(this.actor)) {
-            // Probably someone else has a pointer grab, try again with keyboard only
-            if (!Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED })) {
-                return false;
-            }
-        }
-        this._haveModal = true;
-        this._modifierMask = primaryModifier(mask);
-
-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
-        this.actor.connect('scroll-event', Lang.bind(this, this._scrollEvent));
-
-        this.actor.add_actor(this._switcherList.actor);
-        this._switcherList.connect('item-activated', Lang.bind(this, this._itemActivated));
-        this._switcherList.connect('item-entered', Lang.bind(this, this._itemEntered));
-
-        // Need to force an allocation so we can figure out whether we
-        // need to scroll when selecting
-        this.actor.opacity = 0;
-        this.actor.show();
-        this.actor.get_allocation_box();
-
-        if (this._items.length > 1)
-            this._selectedIndex = 1;
-        else
-            this._selectedIndex = 0;
-
-        this._initialSelection(backward, binding);
-
-        // There's a race condition; if the user released Alt before
-        // we got the grab, then we won't be notified. (See
-        // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
-        // details.) So we check now. (Have to do this after updating
-        // selection.)
-        let [x, y, mods] = global.get_pointer();
-        if (!(mods & this._modifierMask)) {
-            this._finish(global.get_current_time());
-            return false;
-        }
-
-        // We delay showing the popup so that fast Alt+Tab users aren't
-        // disturbed by the popup briefly flashing.
-        this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
-                                                           Lang.bind(this, function () {
-                                                               this.actor.opacity = 255;
-                                                               this._initialDelayTimeoutId = 0;
-                                                           }));
-        return true;
-    },
-
-    _next: function() {
-        return mod(this._selectedIndex + 1, this._items.length);
-    },
-
-    _previous: function() {
-        return mod(this._selectedIndex - 1, this._items.length);
-    },
-
-    _keyPressHandler: function(keysym, backwards, action) {
-        throw new Error('Not implemented');
-    },
-
-    _keyPressEvent: function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let event_state = event.get_state();
-        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
-        let action = global.display.get_keybinding_action(event.get_key_code(), event_state);
-
-        this._disableHover();
-
-        if (keysym == Clutter.Escape)
-            this.destroy();
-        else
-            this._keyPressHandler(keysym, backwards, action);
-
-        return true;
-    },
-
-    _keyReleaseEvent: function(actor, event) {
-        let [x, y, mods] = global.get_pointer();
-        let state = mods & this._modifierMask;
-
-        if (state == 0)
-            this._finish(event.get_time());
-
-        return true;
-    },
-
-    _clickedOutside: function(actor, event) {
-        this.destroy();
-    },
-
-    _scrollHandler: function(direction) {
-        if (direction == Clutter.ScrollDirection.UP)
-            this._select(this._previous());
-        else if (direction == Clutter.ScrollDirection.DOWN)
-            this._select(this._next());
-    },
-
-    _scrollEvent: function(actor, event) {
-        this._scrollHandler(event.get_scroll_direction());
-    },
-
-    _itemActivatedHandler: function(n) {
-        this._select(n);
-    },
-
-    _itemActivated: function(switcher, n) {
-        this._itemActivatedHandler(n);
-        this._finish(global.get_current_time());
-    },
-
-    _itemEnteredHandler: function(n) {
-        this._select(n);
-    },
-
-    _itemEntered: function(switcher, n) {
-        if (!this.mouseActive)
-            return;
-        this._itemEnteredHandler(n);
-    },
-
-    _disableHover: function() {
-        this.mouseActive = false;
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-
-        this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
-    },
-
-    _mouseTimedOut: function() {
-        this._motionTimeoutId = 0;
-        this.mouseActive = true;
-    },
-
-    _popModal: function() {
-        if (this._haveModal) {
-            Main.popModal(this.actor);
-            this._haveModal = false;
-        }
-    },
-
-    destroy: function() {
-        this._popModal();
-        if (this.actor.visible) {
-            Tweener.addTween(this.actor,
-                             { opacity: 0,
-                               time: POPUP_FADE_OUT_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this,
-                                   function() {
-                                       this.actor.destroy();
-                                   })
-                             });
-        } else
-            this.actor.destroy();
-    },
-
-    _finish: function(timestamp) {
-        this.destroy();
-    },
-
-    _onDestroy: function() {
-        this._popModal();
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-        if (this._initialDelayTimeoutId != 0)
-            Mainloop.source_remove(this._initialDelayTimeoutId);
-    },
-
-    _select: function(num) {
-        this._selectedIndex = num;
-        this._switcherList.highlight(num);
-    }
-});
-
-const SwitcherList = new Lang.Class({
-    Name: 'SwitcherList',
-
-    _init : function(squareItems) {
-        this.actor = new Shell.GenericContainer({ style_class: 'switcher-list' });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocateTop));
-
-        // Here we use a GenericContainer so that we can force all the
-        // children except the separator to have the same width.
-        this._list = new Shell.GenericContainer({ style_class: 'switcher-list-item-container' });
-        this._list.spacing = 0;
-        this._list.connect('style-changed', Lang.bind(this, function() {
-                                                        this._list.spacing = this._list.get_theme_node().get_length('spacing');
-                                                     }));
-
-        this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this._list.connect('allocate', Lang.bind(this, this._allocate));
-
-        this._scrollView = new St.ScrollView({ style_class: 'hfade',
-                                               enable_mouse_scrolling: false });
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER);
-
-        let scrollBox = new St.BoxLayout();
-        scrollBox.add_actor(this._list);
-        this._scrollView.add_actor(scrollBox);
-        this.actor.add_actor(this._scrollView);
-
-        // Those arrows indicate whether scrolling in one direction is possible
-        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
-                                               pseudo_class: 'highlighted' });
-        this._leftArrow.connect('repaint', Lang.bind(this,
-            function() { drawArrow(this._leftArrow, St.Side.LEFT); }));
-        this._rightArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
-                                                pseudo_class: 'highlighted' });
-        this._rightArrow.connect('repaint', Lang.bind(this,
-            function() { drawArrow(this._rightArrow, St.Side.RIGHT); }));
-
-        this.actor.add_actor(this._leftArrow);
-        this.actor.add_actor(this._rightArrow);
-
-        this._items = [];
-        this._highlighted = -1;
-        this._separator = null;
-        this._squareItems = squareItems;
-        this._minSize = 0;
-        this._scrollableRight = true;
-        this._scrollableLeft = false;
-    },
-
-    _allocateTop: function(actor, box, flags) {
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-
-        let childBox = new Clutter.ActorBox();
-        let scrollable = this._minSize > box.x2 - box.x1;
-
-        box.y1 -= this.actor.get_theme_node().get_padding(St.Side.TOP);
-        box.y2 += this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-        this._scrollView.allocate(box, flags);
-
-        let arrowWidth = Math.floor(leftPadding / 3);
-        let arrowHeight = arrowWidth * 2;
-        childBox.x1 = leftPadding / 2;
-        childBox.y1 = this.actor.height / 2 - arrowWidth;
-        childBox.x2 = childBox.x1 + arrowWidth;
-        childBox.y2 = childBox.y1 + arrowHeight;
-        this._leftArrow.allocate(childBox, flags);
-        this._leftArrow.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
-
-        arrowWidth = Math.floor(rightPadding / 3);
-        arrowHeight = arrowWidth * 2;
-        childBox.x1 = this.actor.width - arrowWidth - rightPadding / 2;
-        childBox.y1 = this.actor.height / 2 - arrowWidth;
-        childBox.x2 = childBox.x1 + arrowWidth;
-        childBox.y2 = childBox.y1 + arrowHeight;
-        this._rightArrow.allocate(childBox, flags);
-        this._rightArrow.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
-    },
-
-    addItem : function(item, label) {
-        let bbox = new St.Button({ style_class: 'item-box',
-                                   reactive: true });
-
-        bbox.set_child(item);
-        this._list.add_actor(bbox);
-
-        let n = this._items.length;
-        bbox.connect('clicked', Lang.bind(this, function() { this._onItemClicked(n); }));
-        bbox.connect('enter-event', Lang.bind(this, function() { this._onItemEnter(n); }));
-
-        bbox.label_actor = label;
-
-        this._items.push(bbox);
-
-        return bbox;
-    },
-
-    _onItemClicked: function (index) {
-        this._itemActivated(index);
-    },
-
-    _onItemEnter: function (index) {
-        this._itemEntered(index);
-    },
-
-    addSeparator: function () {
-        let box = new St.Bin({ style_class: 'separator' });
-        this._separator = box;
-        this._list.add_actor(box);
-    },
-
-    highlight: function(index, justOutline) {
-        if (this._highlighted != -1) {
-            this._items[this._highlighted].remove_style_pseudo_class('outlined');
-            this._items[this._highlighted].remove_style_pseudo_class('selected');
-        }
-
-        this._highlighted = index;
-
-        if (this._highlighted != -1) {
-            if (justOutline)
-                this._items[this._highlighted].add_style_pseudo_class('outlined');
-            else
-                this._items[this._highlighted].add_style_pseudo_class('selected');
-        }
-
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-        let [absItemX, absItemY] = this._items[index].get_transformed_position();
-        let [result, posX, posY] = this.actor.transform_stage_point(absItemX, 0);
-        let [containerWidth, containerHeight] = this.actor.get_transformed_size();
-        if (posX + this._items[index].get_width() > containerWidth)
-            this._scrollToRight();
-        else if (this._items[index].allocation.x1 - value < 0)
-            this._scrollToLeft();
-
-    },
-
-    _scrollToLeft : function() {
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-        let item = this._items[this._highlighted];
-
-        if (item.allocation.x1 < value)
-            value = Math.min(0, item.allocation.x1);
-        else if (item.allocation.x2 > value + pageSize)
-            value = Math.max(upper, item.allocation.x2 - pageSize);
-
-        this._scrollableRight = true;
-        Tweener.addTween(adjustment,
-                         { value: value,
-                           time: POPUP_SCROLL_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == 0) {
-                                    this._scrollableLeft = false;
-                                    this.actor.queue_relayout();
-                                }
-                           })
-                          });
-    },
-
-    _scrollToRight : function() {
-        let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-        let item = this._items[this._highlighted];
-
-        if (item.allocation.x1 < value)
-            value = Math.max(0, item.allocation.x1);
-        else if (item.allocation.x2 > value + pageSize)
-            value = Math.min(upper, item.allocation.x2 - pageSize);
-
-        this._scrollableLeft = true;
-        Tweener.addTween(adjustment,
-                         { value: value,
-                           time: POPUP_SCROLL_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function () {
-                                if (this._highlighted == this._items.length - 1) {
-                                    this._scrollableRight = false;
-                                    this.actor.queue_relayout();
-                                }
-                            })
-                          });
-    },
-
-    _itemActivated: function(n) {
-        this.emit('item-activated', n);
-    },
-
-    _itemEntered: function(n) {
-        this.emit('item-entered', n);
-    },
-
-    _maxChildWidth: function (forHeight) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_width(forHeight);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-
-            if (this._squareItems) {
-                let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-                maxChildMin = Math.max(childMin, maxChildMin);
-                maxChildNat = Math.max(childNat, maxChildNat);
-            }
-        }
-
-        return [maxChildMin, maxChildNat];
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);
-
-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(forHeight);
-            separatorWidth = sepNat + this._list.spacing;
-        }
-
-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-        alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
-        alloc.natural_size = alloc.min_size;
-        this._minSize = alloc.min_size;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-        }
-
-        if (this._squareItems) {
-            let [childMin, childNat] = this._maxChildWidth(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = maxChildMin;
-        }
-
-        alloc.min_size = maxChildMin;
-        alloc.natural_size = maxChildNat;
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childHeight = box.y2 - box.y1;
-
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-
-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(childHeight);
-            separatorWidth = sepNat;
-            totalSpacing += this._list.spacing;
-        }
-
-        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing - separatorWidth) / this._items.length);
-
-        let x = 0;
-        let children = this._list.get_children();
-        let childBox = new Clutter.ActorBox();
-
-        let primary = Main.layoutManager.primaryMonitor;
-        let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
-
-        for (let i = 0; i < children.length; i++) {
-            if (this._items.indexOf(children[i]) != -1) {
-                let [childMin, childNat] = children[i].get_preferred_height(childWidth);
-                let vSpacing = (childHeight - childNat) / 2;
-                childBox.x1 = x;
-                childBox.y1 = vSpacing;
-                childBox.x2 = x + childWidth;
-                childBox.y2 = childBox.y1 + childNat;
-                children[i].allocate(childBox, flags);
-
-                x += this._list.spacing + childWidth;
-            } else if (children[i] == this._separator) {
-                // We want the separator to be more compact than the rest.
-                childBox.x1 = x;
-                childBox.y1 = 0;
-                childBox.x2 = x + separatorWidth;
-                childBox.y2 = childHeight;
-                children[i].allocate(childBox, flags);
-                x += this._list.spacing + separatorWidth;
-            } else {
-                // Something else, eg, AppSwitcher's arrows;
-                // we don't allocate it.
-            }
-        }
-    }
-});
-Signals.addSignalMethods(SwitcherList.prototype);
-
-function drawArrow(area, side) {
-    let themeNode = area.get_theme_node();
-    let borderColor = themeNode.get_border_color(side);
-    let bodyColor = themeNode.get_foreground_color();
-
-    let [width, height] = area.get_surface_size ();
-    let cr = area.get_context();
-
-    cr.setLineWidth(1.0);
-    Clutter.cairo_set_source_color(cr, borderColor);
-
-    switch (side) {
-    case St.Side.TOP:
-        cr.moveTo(0, height);
-        cr.lineTo(Math.floor(width * 0.5), 0);
-        cr.lineTo(width, height);
-        break;
-
-    case St.Side.BOTTOM:
-        cr.moveTo(width, 0);
-        cr.lineTo(Math.floor(width * 0.5), height);
-        cr.lineTo(0, 0);
-        break;
-
-    case St.Side.LEFT:
-        cr.moveTo(width, height);
-        cr.lineTo(0, Math.floor(height * 0.5));
-        cr.lineTo(width, 0);
-        break;
-
-    case St.Side.RIGHT:
-        cr.moveTo(0, 0);
-        cr.lineTo(width, Math.floor(height * 0.5));
-        cr.lineTo(0, height);
-        break;
-    }
-
-    cr.strokePreserve();
-
-    Clutter.cairo_set_source_color(cr, bodyColor);
-    cr.fill();
-    cr.$dispose();
-}
-

js/ui/unlockDialog.js

@@ -5,7 +5,6 @@ const Clutter = imports.gi.Clutter;
 const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Signals = imports.signals;
@@ -14,14 +13,12 @@ const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
-const Panel = imports.ui.panel;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserMenu = imports.ui.userMenu;
 
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
-const LoginDialog = imports.gdm.loginDialog;
 
 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;
@@ -115,7 +112,6 @@ const UnlockDialog = new Lang.Class({
     _init: function(parentActor) {
         this.parent({ shellReactive: true,
                       styleClass: 'login-dialog',
-                      keybindingMode: Main.KeybindingMode.UNLOCK_SCREEN,
                       parentActor: parentActor
                     });
 
@@ -153,9 +149,7 @@ const UnlockDialog = new Lang.Class({
         this._promptEntry.clutter_text.set_password_char('\u25cf');
         ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
         this.setInitialKeyFocus(this._promptEntry);
-        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
-            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
-        }));
+        this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
 
         this._promptLayout.add(this._promptEntry,
                                { expand: true,
@@ -170,54 +164,29 @@ const UnlockDialog = new Lang.Class({
         this._promptLoginHint.hide();
         this.contentLayout.add_actor(this._promptLoginHint);
 
-        this._workSpinner = new Panel.AnimatedIcon('process-working.svg', LoginDialog.WORK_SPINNER_ICON_SIZE);
-        this._workSpinner.actor.opacity = 0;
-
-        this.allowCancel = false;
-        this.buttonLayout.visible = true;
-        this.addButton({ label: _("Cancel"),
-                         action: Lang.bind(this, this._escape),
-                         key: Clutter.KEY_Escape },
-                       { expand: true,
-                         x_fill: false,
-                         y_fill: false,
-                         x_align: St.Align.START,
-                         y_align: St.Align.MIDDLE });
-        this.buttonLayout.add(this._workSpinner.actor,
-                              { expand: false,
-                                x_fill: false,
-                                y_fill: false,
-                                x_align: St.Align.END,
-                                y_align: St.Align.MIDDLE });
-        this._okButton = this.addButton({ label: _("Unlock"),
-                                          action: Lang.bind(this, this._doUnlock),
-                                          default: true },
-                                        { expand: false,
-                                          x_fill: false,
-                                          y_fill: false,
-                                          x_align: St.Align.END,
-                                          y_align: St.Align.MIDDLE });
-
-        let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
-        if (screenSaverSettings.get_boolean('user-switch-enabled')) {
-            let otherUserLabel = new St.Label({ text: _("Log in as another user"),
-                                                style_class: 'login-dialog-not-listed-label' });
-            this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
-                                                    can_focus: true,
-                                                    child: otherUserLabel,
-                                                    reactive: true,
-                                                    x_align: St.Align.START,
-                                                    x_fill: true });
-            this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-            this.dialogLayout.add(this._otherUserButton,
-                                  { x_align: St.Align.START,
-                                    x_fill: false });
-        } else {
-            this._otherUserButton = null;
-        }
+        let cancelButton = { label: _("Cancel"),
+                             action: Lang.bind(this, this._escape),
+                             key: Clutter.KEY_Escape };
+        this._okButton = { label: _("Unlock"),
+                           action: Lang.bind(this, this._doUnlock),
+                           default: true };
+        this.setButtons([cancelButton, this._okButton]);
 
         this._updateSensitivity(true);
 
+        let otherUserLabel = new St.Label({ text: _("Log in as another user"),
+                                            style_class: 'login-dialog-not-listed-label' });
+        this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
+                                                can_focus: true,
+                                                child: otherUserLabel,
+                                                reactive: true,
+                                                x_align: St.Align.START,
+                                                x_fill: true });
+        this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
+        this.dialogLayout.add(this._otherUserButton,
+                              { x_align: St.Align.START,
+                                x_fill: false });
+
         let batch = new Batch.Hold();
         this._userVerifier.begin(this._userName, batch);
 
@@ -226,47 +195,17 @@ const UnlockDialog = new Lang.Class({
             return false;
         }));
 
-        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
-
-        this._idleMonitor = new GnomeDesktop.IdleMonitor();
+        this._idleMonitor = Shell.IdleMonitor.get();
+        // this dialog is only created after user activity (curtain drag or
+        // escape key press), so the timeout will fire after IDLE_TIMEOUT seconds of inactivity
         this._idleWatchId = this._idleMonitor.add_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
     },
 
     _updateSensitivity: function(sensitive) {
         this._promptEntry.reactive = sensitive;
         this._promptEntry.clutter_text.editable = sensitive;
-        this._updateOkButtonSensitivity(sensitive && this._promptEntry.text.length > 0);
-        if (this._otherUserButton) {
-            this._otherUserButton.reactive = sensitive;
-            this._otherUserButton.can_focus = sensitive;
-        }
-    },
-
-    _updateOkButtonSensitivity: function(sensitive) {
-        this._okButton.reactive = sensitive;
-        this._okButton.can_focus = sensitive;
-    },
-
-    _setWorking: function(working) {
-        if (working) {
-            this._workSpinner.play();
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 255,
-                               delay: LoginDialog.WORK_SPINNER_ANIMATION_DELAY,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear'
-                             });
-        } else {
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 0,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear',
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   this._workSpinner.stop();
-                               }
-                             });
-        }
+        this._okButton.button.reactive = sensitive;
+        this._okButton.button.can_focus = sensitive;
     },
 
     _showMessage: function(userVerifier, message, styleClass) {
@@ -299,7 +238,6 @@ const UnlockDialog = new Lang.Class({
 
         this._currentQuery = serviceName;
         this._updateSensitivity(true);
-        this._setWorking(false);
     },
 
     _showLoginHint: function(verifier, message) {
@@ -318,7 +256,6 @@ const UnlockDialog = new Lang.Class({
             // the actual reply to GDM will be sent as soon as asked
             this._firstQuestionAnswer = this._promptEntry.text;
             this._updateSensitivity(false);
-            this._setWorking(true);
             return;
         }
 
@@ -329,7 +266,6 @@ const UnlockDialog = new Lang.Class({
         this._currentQuery = null;
 
         this._updateSensitivity(false);
-        this._setWorking(true);
 
         this._userVerifier.answerQuery(query, this._promptEntry.text);
     },
@@ -352,14 +288,11 @@ const UnlockDialog = new Lang.Class({
         this._promptEntry.menu.isPassword = true;
 
         this._updateSensitivity(false);
-        this._setWorking(false);
     },
 
     _escape: function() {
-        if (this.allowCancel) {
-            this._userVerifier.cancel();
-            this.emit('failed');
-        }
+        this._userVerifier.cancel();
+        this.emit('failed');
     },
 
     _otherUserClicked: function(button, event) {

js/ui/userMenu.js

@@ -9,11 +9,11 @@ const Pango = imports.gi.Pango;
 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 BoxPointer = imports.ui.boxpointer;
 const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -22,13 +22,11 @@ const Util = imports.misc.util;
 
 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
-const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
 const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 const DISABLE_LOG_OUT_KEY = 'disable-log-out';
 const LOCK_ENABLED_KEY = 'lock-enabled';
 const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
-const SHOW_FULL_NAME_IN_TOP_BAR_KEY = 'show-full-name-in-top-bar';
 
 const DIALOG_ICON_SIZE = 64;
 
@@ -76,6 +74,11 @@ const UserAvatarWidget = new Lang.Class({
             let file = Gio.File.new_for_path(iconFile);
             this.actor.child = null;
             this.actor.style = 'background-image: url("%s");'.format(iconFile);
+
+            // AccountsService uses a fixed location for avatar images, so
+            // we need to clear out all cached data to pick up image changes,
+            // see https://bugzilla.gnome.org/show_bug.cgi?id=679268
+            this.actor.clear_background_image();
         } else {
             this.actor.style = null;
             this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
@@ -190,7 +193,7 @@ const IMStatusChooserItem = new Lang.Class({
         item = new IMStatusItem(_("Idle"), 'user-idle-symbolic');
         this._combo.addMenuItem(item, IMStatus.IDLE);
 
-        item = new IMStatusItem(_("Offline"), 'user-offline-symbolic');
+        item = new IMStatusItem(_("Unavailable"), 'user-offline-symbolic');
         this._combo.addMenuItem(item, IMStatus.OFFLINE);
 
         this._combo.connect('active-item-changed',
@@ -478,7 +481,6 @@ const UserMenuButton = new Lang.Class({
 
         this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
 
         this._userManager = AccountsService.UserManager.get_default();
 
@@ -486,11 +488,10 @@ const UserMenuButton = new Lang.Class({
         this._presence = new GnomeSession.Presence();
         this._session = new GnomeSession.SessionManager();
         this._haveShutdown = true;
-        this._haveSuspend = true;
 
         this._accountMgr = Tp.AccountManager.dup();
 
-        this._loginManager = LoginManager.getLoginManager();
+        this._upClient = new UPowerGlib.Client();
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
         this._iconBox = new St.Bin();
@@ -553,12 +554,9 @@ const UserMenuButton = new Lang.Class({
                                        Lang.bind(this, this._updateSwitchUser));
         this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
                                        Lang.bind(this, this._updateLogout));
+
         this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
                                        Lang.bind(this, this._updateLockScreen));
-        this._screenSaverSettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
-                                           Lang.bind(this, this._updateUserName));
-        this._privacySettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
-                                      Lang.bind(this, this._updateUserName));
         this._updateSwitchUser();
         this._updateLogout();
         this._updateLockScreen();
@@ -573,15 +571,14 @@ const UserMenuButton = new Lang.Class({
         // the lockdown setting changes, which should be close enough.
         this.menu.connect('open-state-changed', Lang.bind(this,
             function(menu, open) {
-                if (!open)
-                    return;
-
-                this._updateHaveShutdown();
-                this._updateHaveSuspend();
+                if (open)
+                    this._updateHaveShutdown();
             }));
         this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
                                        Lang.bind(this, this._updateHaveShutdown));
 
+        this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
+
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
         this._sessionUpdated();
     },
@@ -595,7 +592,6 @@ const UserMenuButton = new Lang.Class({
 
         this.setSensitive(!Main.sessionMode.isLocked);
         this._updatePresenceIcon();
-        this._updateUserName();
     },
 
     _onDestroy: function() {
@@ -604,10 +600,7 @@ const UserMenuButton = new Lang.Class({
     },
 
     _updateUserName: function() {
-        let settings = this._privacySettings;
-        if (Main.sessionMode.isLocked)
-            settings = this._screenSaverSettings;
-        if (this._user.is_loaded && settings.get_boolean(SHOW_FULL_NAME_IN_TOP_BAR_KEY))
+        if (this._user.is_loaded)
             this._name.set_text(this._user.get_real_name());
         else
             this._name.set_text("");
@@ -657,15 +650,9 @@ const UserMenuButton = new Lang.Class({
             }));
     },
 
-    _updateHaveSuspend: function() {
-        this._loginManager.canSuspend(Lang.bind(this,
-            function(result) {
-                this._haveSuspend = result;
-                this._updateSuspendOrPowerOff();
-        }));
-    },
-
     _updateSuspendOrPowerOff: function() {
+        this._haveSuspend = this._upClient.get_can_suspend();
+
         if (!this._suspendOrPowerOffItem)
             return;
 
@@ -762,7 +749,7 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("Settings"));
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
         item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
         this.menu.addMenuItem(item);
         this._systemSettings = item;
@@ -868,13 +855,13 @@ const UserMenuButton = new Lang.Class({
                 let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
                     Main.screenShield.disconnect(tmpId);
 
-                    this._loginManager.suspend();
+                    this._upClient.suspend_sync(null);
                 }));
 
                 this.menu.close(BoxPointer.PopupAnimation.NONE);
                 Main.screenShield.lock(true);
             } else {
-                this._loginManager.suspend();
+                this._upClient.suspend_sync(null);
             }
         }
     }

js/ui/viewSelector.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -20,7 +19,6 @@ const Tweener = imports.ui.tweener;
 const Wanda = imports.ui.wanda;
 const WorkspacesView = imports.ui.workspacesView;
 
-const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 
 const FocusTrap = new Lang.Class({
     Name: 'FocusTrap',
@@ -39,11 +37,17 @@ const ViewSelector = new Lang.Class({
     Name: 'ViewSelector',
 
     _init : function(searchEntry, showAppsButton) {
-        this.actor = new Shell.Stack({ name: 'viewSelector' });
+        this.actor = new St.BoxLayout({ name: 'viewSelector',
+                                        vertical: true });
 
         this._showAppsButton = showAppsButton;
         this._showAppsButton.connect('notify::checked', Lang.bind(this, this._onShowAppsButtonToggled));
 
+        this._pageArea = new Shell.Stack();
+        this.actor.add(this._pageArea, { x_fill: true,
+                                         y_fill: true,
+                                         expand: true });
+
         this._activePage = null;
 
         this.active = false;
@@ -78,21 +82,16 @@ const ViewSelector = new Lang.Class({
 
         this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
         this._workspacesPage = this._addPage(this._workspacesDisplay.actor, null,
-                                             _("Windows"), 'emblem-documents-symbolic');
+                                             _("Windows"), 'text-x-generic-symbolic');
 
         this._appDisplay = new AppDisplay.AllAppDisplay();
         this._appsPage = this._addPage(this._appDisplay.actor, null,
-                                       _("Applications"), 'view-grid-symbolic');
+                                       _("Applications"), 'system-run-symbolic');
 
         this._searchResults = new SearchDisplay.SearchResults(this._searchSystem);
         this._searchPage = this._addPage(this._searchResults.actor, this._entry,
                                          _("Search"), 'edit-find-symbolic');
 
-        this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
-
         // Default search providers
         // Wanda comes obviously first
         this.addSearchProvider(new Wanda.WandaSearchProvider());
@@ -132,17 +131,16 @@ const ViewSelector = new Lang.Class({
                 }
             }));
 
-        Main.wm.addKeybinding('toggle-application-view',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._toggleAppsPage));
-    },
-
-    _toggleAppsPage: function() {
-        Main.overview.show();
-        this._showAppsButton.checked = !this._showAppsButton.checked;
+        // Public constraints which may be used to tie actors' height or
+        // vertical position to the current tab's content; as the content's
+        // height and position depend on the view selector's style properties
+        // (e.g. font size, padding, spacing, ...) it would be extremely hard
+        // and ugly to get these from the outside. While it would be possible
+        // to use position and height properties directly, outside code would
+        // need to ensure that the content is properly allocated before
+        // accessing the properties.
+        this.constrainHeight = new Clutter.BindConstraint({ source: this._pageArea,
+                                                            coordinate: Clutter.BindCoordinate.HEIGHT });
     },
 
     show: function() {
@@ -185,8 +183,8 @@ const ViewSelector = new Lang.Class({
                                                       this._a11yFocusPage(page);
                                                   })
                                             });;
-        this.actor.add_actor(page);
-        return page;
+        this._pageArea.add_actor(page);
+        return page
     },
 
     _showPage: function(page) {
@@ -232,11 +230,6 @@ const ViewSelector = new Lang.Class({
     },
 
     _onStageKeyPress: function(actor, event) {
-        // Ignore events while anything but the overview has
-        // pushed a modal (system modals, looking glass, ...)
-        if (Main.modalCount > 1)
-            return false;
-
         let modifiers = event.get_state();
         let symbol = event.get_key_symbol();
 
@@ -428,32 +421,7 @@ const ViewSelector = new Lang.Class({
         this._showPage(this._searchPage);
     },
 
-    _shouldUseSearchProvider: function(provider) {
-        // the disable-external GSetting only affects remote providers
-        if (!provider.isRemoteProvider)
-            return true;
-
-        if (this._searchSettings.get_boolean('disable-external'))
-            return false;
-
-        let appId = provider.appInfo.get_id();
-        let disable = this._searchSettings.get_strv('disabled');
-        return disable.indexOf(appId) == -1;
-    },
-
-    _reloadRemoteProviders: function() {
-        // removeSearchProvider() modifies the provider list we iterate on,
-        // so make a copy first
-        let remoteProviders = this._searchSystem.getRemoteProviders().slice(0);
-
-        remoteProviders.forEach(Lang.bind(this, this.removeSearchProvider));
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
-    },
-
     addSearchProvider: function(provider) {
-        if (!this._shouldUseSearchProvider(provider))
-            return;
-
         this._searchSystem.registerProvider(provider);
         this._searchResults.createProviderMeta(provider);
     },

js/ui/wanda.js

@@ -9,7 +9,7 @@ const St = imports.gi.St;
 const IconGrid = imports.ui.iconGrid;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
+const Search = imports.ui.search;
 
 // we could make these gsettings
 const FISH_NAME = 'wanda';
@@ -53,9 +53,20 @@ const WandaIcon = new Lang.Class({
                                  icon_size: iconSize });
         }
 
-        this._animations = new Panel.Animation(this._imageFile, this._imgWidth, this._imgHeight, FISH_SPEED);
-        this._animations.play();
-        return this._animations.actor;
+        this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight);
+        this._animations.connect('notify::mapped', Lang.bind(this, function() {
+            if (this._animations.mapped && !this._timeoutId) {
+                this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));
+
+                this._i = 0;
+                this._update();
+            } else if (!this._animations.mapped && this._timeoutId) {
+                GLib.source_remove(this._timeoutId);
+                this._timeoutId = 0;
+            }
+        }));
+
+        return this._animations;
     },
 
     _createIconTexture: function(size) {
@@ -63,14 +74,28 @@ const WandaIcon = new Lang.Class({
             return;
 
         this.parent(size);
-    }
+    },
+
+    _update: function() {
+        let n = this._animations.get_n_children();
+        if (n == 0) {
+            return true;
+        }
+
+        this._animations.get_child_at_index(this._i).hide();
+        this._i = (this._i + 1) % n;
+        this._animations.get_child_at_index(this._i).show();
+
+        return true;
+    },
 });
 
 const WandaIconBin = new Lang.Class({
     Name: 'WandaIconBin',
 
     _init: function(fish, label, params) {
-        this.actor = new St.Bin({ reactive: true,
+        this.actor = new St.Bin({ style_class: 'search-result-content',
+                                  reactive: true,
                                   track_hover: true });
         this.icon = new WandaIcon(fish, label, params);
 
@@ -131,9 +156,10 @@ function capitalize(str) {
 
 const WandaSearchProvider = new Lang.Class({
     Name: 'WandaSearchProvider',
+    Extends: Search.SearchProvider,
 
     _init: function() {
-        this.id = 'wanda';
+        this.parent(_("Your favorite Easter Egg"));
     },
 
     getResultMetas: function(fish, callback) {
@@ -159,7 +185,7 @@ const WandaSearchProvider = new Lang.Class({
         this.getInitialResultSet(terms);
     },
 
-    activateResult: function(fish) {
+    activateResult: function(fish, params) {
         if (this._dialog)
             this._dialog.destroy();
         this._dialog = new FortuneDialog(capitalize(fish), FISH_COMMAND);

js/ui/windowAttentionHandler.js

@@ -39,8 +39,6 @@ const WindowAttentionHandler = new Lang.Class({
         let [title, banner] = this._getTitleAndBanner(app, window);
 
         let notification = new MessageTray.Notification(source, title, banner);
-        notification.setForFeedback(true);
-
         source.notify(notification);
 
         source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {

js/ui/windowManager.js

@@ -83,8 +83,6 @@ const WindowManager = new Lang.Class({
 
         this._animationBlockCount = 0;
 
-        this._allowedKeybindings = {};
-
         this._switchData = null;
         this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
         this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
@@ -101,79 +99,38 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
         this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
         this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
 
         this._workspaceSwitcherPopup = null;
-        this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-applications',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group-backward',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-windows',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startWindowSwitcher));
-        this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startWindowSwitcher));
-        this.setCustomKeybindingHandler('switch-panels',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW |
-                                        Main.KeybindingMode.LOCK_SCREEN |
-                                        Main.KeybindingMode.UNLOCK_SCREEN |
-                                        Main.KeybindingMode.LOGIN_SCREEN,
-                                        Lang.bind(this, this._startA11ySwitcher));
-        this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW |
-                                        Main.KeybindingMode.LOCK_SCREEN |
-                                        Main.KeybindingMode.UNLOCK_SCREEN |
-                                        Main.KeybindingMode.LOGIN_SCREEN,
-                                        Lang.bind(this, this._startA11ySwitcher));
-
-        this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                           Meta.KeyBindingFlags.NONE,
-                           Main.KeybindingMode.NORMAL,
-                           Lang.bind(this, this._openAppMenu));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-panels',
+                                            Lang.bind(this, this._startA11ySwitcher));
+        global.display.add_keybinding('open-application-menu',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._openAppMenu));
 
         Main.overview.connect('showing', Lang.bind(this, function() {
             for (let i = 0; i < this._dimmedWindows.length; i++)
@@ -185,27 +142,6 @@ const WindowManager = new Lang.Class({
         }));
     },
 
-    setCustomKeybindingHandler: function(name, modes, handler) {
-        if (Meta.keybindings_set_custom_handler(name, handler))
-            this.allowKeybinding(name, modes);
-    },
-
-    addKeybinding: function(name, settings, flags, modes, handler) {
-        let action = global.display.add_keybinding(name, settings, flags, handler);
-        if (action != Meta.KeyBindingAction.NONE)
-            this.allowKeybinding(name, modes);
-        return action;
-    },
-
-    removeKeybinding: function(name) {
-        if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Main.KeybindingMode.NONE);
-    },
-
-    allowKeybinding: function(name, modes) {
-        this._allowedKeybindings[name] = modes;
-    },
-
     blockAnimations: function() {
         this._animationBlockCount++;
     },
@@ -221,9 +157,7 @@ const WindowManager = new Lang.Class({
     _shouldAnimateActor: function(actor) {
         if (!this._shouldAnimate())
             return false;
-        let windowType = actor.meta_window.get_window_type();
-        return windowType == Meta.WindowType.NORMAL ||
-            windowType == Meta.WindowType.MODAL_DIALOG;
+        return actor.meta_window.get_window_type() == Meta.WindowType.NORMAL;
     },
 
     _removeEffect : function(list, actor) {
@@ -249,17 +183,16 @@ const WindowManager = new Lang.Class({
          */
         this._minimizing.push(actor);
 
-        let monitor = Main.layoutManager.findMonitorForWindow(actor.meta_window);
-        let xDest = monitor.x;
-        let yDest = monitor.y;
+        let primary = Main.layoutManager.primaryMonitor;
+        let xDest = primary.x;
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            xDest += monitor.width;
+            xDest += primary.width;
 
         Tweener.addTween(actor,
                          { scale_x: 0.0,
                            scale_y: 0.0,
                            x: xDest,
-                           y: yDest,
+                           y: 0,
                            time: WINDOW_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: this._minimizeWindowDone,
@@ -374,56 +307,57 @@ const WindowManager = new Lang.Class({
 
             actor._windowType = type;
         }));
+        if (actor.meta_window.is_attached_dialog()) {
+            this._checkDimming(actor.get_meta_window().get_transient_for());
+            if (this._shouldAnimate()) {
+                actor.set_scale(1.0, 0.0);
+                actor.scale_gravity = Clutter.Gravity.CENTER;
+                actor.show();
+                this._mapping.push(actor);
 
+                Tweener.addTween(actor,
+                                 { scale_y: 1,
+                                   time: WINDOW_ANIMATION_TIME,
+                                   transition: "easeOutQuad",
+                                   onComplete: this._mapWindowDone,
+                                   onCompleteScope: this,
+                                   onCompleteParams: [shellwm, actor],
+                                   onOverwrite: this._mapWindowOverwrite,
+                                   onOverwriteScope: this,
+                                   onOverwriteParams: [shellwm, actor]
+                                 });
+                return;
+            }
+            shellwm.completed_map(actor);
+            return;
+        }
         if (!this._shouldAnimateActor(actor)) {
             shellwm.completed_map(actor);
             return;
         }
 
-        if (actor.meta_window.is_attached_dialog()) {
-            /* Scale the window from the center of the parent */
-            this._checkDimming(actor.get_meta_window().get_transient_for());
-            actor.set_scale(1.0, 0.0);
-            actor.scale_gravity = Clutter.Gravity.CENTER;
-            actor.show();
-            this._mapping.push(actor);
+        actor.opacity = 0;
+        actor.show();
 
-            Tweener.addTween(actor,
-                             { scale_y: 1,
-                               time: WINDOW_ANIMATION_TIME,
-                               transition: "easeOutQuad",
-                               onComplete: this._mapWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._mapWindowOverwrite,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        } else {
-            /* Fade window in */
-            actor.opacity = 0;
-            actor.show();
-            this._mapping.push(actor);
-
-            Tweener.addTween(actor,
-                             { opacity: 255,
-                               time: WINDOW_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: this._mapWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._mapWindowOverwrite,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        }
+        /* Fade window in */
+        this._mapping.push(actor);
+        Tweener.addTween(actor,
+                         { opacity: 255,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._mapWindowDone,
+                           onCompleteScope: this,
+                           onCompleteParams: [shellwm, actor],
+                           onOverwrite: this._mapWindowOverwrite,
+                           onOverwriteScope: this,
+                           onOverwriteParams: [shellwm, actor]
+                         });
     },
 
     _mapWindowDone : function(shellwm, actor) {
         if (this._removeEffect(this._mapping, actor)) {
             Tweener.removeTweens(actor);
             actor.opacity = 255;
-            actor.scale_y = 1;
             shellwm.completed_map(actor);
         }
     },
@@ -445,21 +379,18 @@ const WindowManager = new Lang.Class({
                                                                  return win != window;
                                                              });
         }
-
-        if (!this._shouldAnimateActor(actor)) {
-            shellwm.completed_destroy(actor);
-            return;
-        }
-
-        this._destroying.push(actor);
-
         if (window.is_attached_dialog()) {
             let parent = window.get_transient_for();
             this._checkDimming(parent, window);
+            if (!this._shouldAnimate()) {
+                shellwm.completed_destroy(actor);
+                return;
+            }
 
             actor.set_scale(1.0, 1.0);
             actor.scale_gravity = Clutter.Gravity.CENTER;
             actor.show();
+            this._destroying.push(actor);
 
             actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
                 Tweener.removeTweens(actor);
@@ -493,21 +424,6 @@ const WindowManager = new Lang.Class({
         }
     },
 
-    _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Main.KeybindingMode.NONE)
-            return true;
-
-        // There's little sense in implementing a keybinding in mutter and
-        // not having it work in NORMAL mode; handle this case generically
-        // so we don't have to explicitly allow all builtin keybindings in
-        // NORMAL mode.
-        if (Main.keybindingMode == Main.KeybindingMode.NORMAL &&
-            binding.is_builtin())
-            return false;
-
-        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
-    },
-
     _switchWorkspace : function(shellwm, from, to, direction) {
         if (!this._shouldAnimate()) {
             shellwm.completed_switch_workspace();
@@ -630,20 +546,7 @@ const WindowManager = new Lang.Class({
         if (this._workspaceSwitcherPopup != null)
             this._workspaceSwitcherPopup.destroy();
 
-        let tabPopup = new AltTab.AppSwitcherPopup();
-
-        let modifiers = binding.get_modifiers();
-        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask()))
-            tabPopup.destroy();
-    },
-
-    _startWindowSwitcher : function(display, screen, window, binding) {
-        /* prevent a corner case where both popups show up at once */
-        if (this._workspaceSwitcherPopup != null)
-            this._workspaceSwitcherPopup.destroy();
-
-        let tabPopup = new AltTab.WindowSwitcherPopup();
+        let tabPopup = new AltTab.AltTabPopup();
 
         let modifiers = binding.get_modifiers();
         let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
@@ -654,7 +557,7 @@ const WindowManager = new Lang.Class({
     _startA11ySwitcher : function(display, screen, window, binding) {
         let modifiers = binding.get_modifiers();
         let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
-        Main.ctrlAltTabManager.popup(backwards, binding.get_name(), binding.get_mask());
+        Main.ctrlAltTabManager.popup(backwards, binding.get_mask());
     },
 
     _openAppMenu : function(display, screen, window, event, binding) {

js/ui/workspaceThumbnail.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -28,8 +27,6 @@ const WORKSPACE_CUT_SIZE = 10;
 
 const WORKSPACE_KEEP_ALIVE_TIME = 100;
 
-const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
-
 const WindowClone = new Lang.Class({
     Name: 'WindowClone',
 
@@ -544,12 +541,6 @@ const ThumbnailsBox = new Lang.Class({
 
         this.actor.connect('button-press-event', function() { return true; });
         this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
-        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-
-        Main.overview.connect('showing',
-                              Lang.bind(this, this._createThumbnails));
-        Main.overview.connect('hidden',
-                              Lang.bind(this, this._destroyThumbnails));
 
         Main.overview.connect('item-drag-begin',
                               Lang.bind(this, this._onDragBegin));
@@ -563,16 +554,6 @@ const ThumbnailsBox = new Lang.Class({
                               Lang.bind(this, this._onDragEnd));
         Main.overview.connect('window-drag-cancelled',
                               Lang.bind(this, this._onDragCancelled));
-
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
-        this._settings.connect('changed::dynamic-workspaces',
-            Lang.bind(this, this._updateSwitcherVisibility));
-    },
-
-    _updateSwitcherVisibility: function() {
-        this.actor.visible =
-            this._settings.get_boolean('dynamic-workspaces') ||
-                global.screen.n_workspaces > 1;
     },
 
     _onButtonRelease: function(actor, event) {
@@ -738,16 +719,10 @@ const ThumbnailsBox = new Lang.Class({
         }
     },
 
-    _createThumbnails: function() {
+    show: function() {
         this._switchWorkspaceNotifyId =
             global.window_manager.connect('switch-workspace',
                                           Lang.bind(this, this._activeWorkspaceChanged));
-        this._nWorkspacesNotifyId =
-            global.screen.connect('notify::n-workspaces',
-                                  Lang.bind(this, this._workspacesChanged));
-        this._syncStackingId =
-            Main.overview.connect('windows-restacked',
-                                  Lang.bind(this, this._syncStacking));
 
         this._targetScale = 0;
         this._scale = 0;
@@ -769,54 +744,19 @@ const ThumbnailsBox = new Lang.Class({
         };
 
         this.addThumbnails(0, global.screen.n_workspaces);
-
-        this._updateSwitcherVisibility();
     },
 
-    _destroyThumbnails: function() {
+    hide: function() {
         if (this._switchWorkspaceNotifyId > 0) {
             global.window_manager.disconnect(this._switchWorkspaceNotifyId);
             this._switchWorkspaceNotifyId = 0;
         }
-        if (this._nWorkspacesNotifyId > 0) {
-            global.screen.disconnect(this._nWorkspacesNotifyId);
-            this._nWorkspacesNotifyId = 0;
-        }
-
-        if (this._syncStackingId > 0) {
-            Main.overview.disconnect(this._syncStackingId);
-            this._syncStackingId = 0;
-        }
 
         for (let w = 0; w < this._thumbnails.length; w++)
             this._thumbnails[w].destroy();
         this._thumbnails = [];
     },
 
-    _workspacesChanged: function() {
-        let oldNumWorkspaces = this._thumbnails.length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
-
-        if (newNumWorkspaces > oldNumWorkspaces) {
-            this.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
-        } else {
-            let removedIndex;
-            let removedNum = oldNumWorkspaces - newNumWorkspaces;
-            for (let w = 0; w < oldNumWorkspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                if (this._thumbnails[w].metaWorkspace != metaWorkspace) {
-                    removedIndex = w;
-                    break;
-                }
-            }
-
-            this.removeThumbnails(removedIndex, removedNum);
-        }
-
-        this._updateSwitcherVisibility();
-    },
-
     addThumbnails: function(start, count) {
         for (let k = start; k < start + count; k++) {
             let metaWorkspace = global.screen.get_workspace_by_index(k);
@@ -862,7 +802,7 @@ const ThumbnailsBox = new Lang.Class({
         this._queueUpdateStates();
     },
 
-    _syncStacking: function(overview, stackIndices) {
+    syncStacking: function(stackIndices) {
         for (let i = 0; i < this._thumbnails.length; i++)
             this._thumbnails[i].syncStacking(stackIndices);
     },
@@ -1217,16 +1157,5 @@ const ThumbnailsBox = new Lang.Class({
                            },
                            onCompleteScope: this
                          });
-    },
-
-    _onScrollEvent: function (actor, event) {
-        switch (event.get_scroll_direction()) {
-        case Clutter.ScrollDirection.UP:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
-            break;
-        case Clutter.ScrollDirection.DOWN:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
-            break;
-        }
     }
 });

js/ui/workspacesView.js

@@ -2,7 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -52,6 +51,7 @@ const WorkspacesView = new Lang.Class({
         this._clipY = 0;
         this._clipWidth = 0;
         this._clipHeight = 0;
+        this._workspaceRatioSpacing = 0;
         this._spacing = 0;
         this._animating = false; // tweening
         this._scrolling = false; // swipe-scrolling
@@ -69,10 +69,9 @@ const WorkspacesView = new Lang.Class({
 
         // Add workspace actors
         for (let w = 0; w < global.screen.n_workspaces; w++)
-            this.actor.add_actor(this._workspaces[w].actor);
+            this._workspaces[w].actor.reparent(this.actor);
         this._workspaces[activeWorkspaceIndex].actor.raise_top();
 
-        this._extraWorkspaces = [];
         this._updateExtraWorkspaces();
 
         // Position/scale the desktop windows and their children after the
@@ -84,6 +83,8 @@ const WorkspacesView = new Lang.Class({
                                  Lang.bind(this, function() {
                 for (let w = 0; w < this._workspaces.length; w++)
                     this._workspaces[w].zoomToOverview();
+                if (!this._extraWorkspaces)
+                    return;
                 for (let w = 0; w < this._extraWorkspaces.length; w++)
                     this._extraWorkspaces[w].zoomToOverview();
         }));
@@ -123,36 +124,38 @@ const WorkspacesView = new Lang.Class({
         if (!this._settings.get_boolean('workspaces-only-on-primary'))
             return;
 
+        this._extraWorkspaces = [];
         let monitors = Main.layoutManager.monitors;
         for (let i = 0; i < monitors.length; i++) {
             if (i == Main.layoutManager.primaryIndex)
                 continue;
 
             let ws = new Workspace.Workspace(null, i);
-            ws.setGeometry(monitors[i].x,
-                           monitors[i].y,
-                           monitors[i].width,
-                           monitors[i].height);
+            ws.setGeometry(monitors[i].x, monitors[i].y,
+                           monitors[i].width, monitors[i].height);
             global.overlay_group.add_actor(ws.actor);
             this._extraWorkspaces.push(ws);
         }
     },
 
     _destroyExtraWorkspaces: function() {
+        if (!this._extraWorkspaces)
+            return;
+
         for (let m = 0; m < this._extraWorkspaces.length; m++)
             this._extraWorkspaces[m].destroy();
-        this._extraWorkspaces = [];
+        this._extraWorkspaces = null;
     },
 
-    setGeometry: function(x, y, width, height) {
+    setGeometry: function(x, y, width, height, spacing) {
       if (this._x == x && this._y == y &&
           this._width == width && this._height == height)
           return;
-
         this._width = width;
         this._height = height;
         this._x = x;
         this._y = y;
+        this._workspaceRatioSpacing = spacing;
 
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].setGeometry(x, y, width, height);
@@ -188,6 +191,8 @@ const WorkspacesView = new Lang.Class({
 
         for (let w = 0; w < this._workspaces.length; w++)
             this._workspaces[w].zoomFromOverview();
+        if (!this._extraWorkspaces)
+            return;
         for (let w = 0; w < this._extraWorkspaces.length; w++)
             this._extraWorkspaces[w].zoomFromOverview();
     },
@@ -199,6 +204,8 @@ const WorkspacesView = new Lang.Class({
     syncStacking: function(stackIndices) {
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].syncStacking(stackIndices);
+        if (!this._extraWorkspaces)
+            return;
         for (let i = 0; i < this._extraWorkspaces.length; i++)
             this._extraWorkspaces[i].syncStacking(stackIndices);
     },
@@ -208,11 +215,11 @@ const WorkspacesView = new Lang.Class({
             this._workspaces[w].positionWindows(Workspace.WindowPositionFlags.ANIMATE);
     },
 
-    _scrollToActive: function() {
+    _scrollToActive: function(showAnimation) {
         let active = global.screen.get_active_workspace_index();
 
-        this._updateWorkspaceActors(true);
-        this._updateScrollAdjustment(active);
+        this._updateWorkspaceActors(showAnimation);
+        this._updateScrollAdjustment(active, showAnimation);
     },
 
     // Update workspace actors parameters
@@ -227,7 +234,7 @@ const WorkspacesView = new Lang.Class({
 
             Tweener.removeTweens(workspace.actor);
 
-            let y = (w - active) * (this._height + this._spacing);
+            let y = (w - active) * (this._height + this._spacing + this._workspaceRatioSpacing);
 
             if (showAnimation) {
                 let params = { y: y,
@@ -270,21 +277,26 @@ const WorkspacesView = new Lang.Class({
         }
     },
 
-    _updateScrollAdjustment: function(index) {
+    _updateScrollAdjustment: function(index, showAnimation) {
         if (this._scrolling)
             return;
 
         this._animatingScroll = true;
 
-        Tweener.addTween(this.scrollAdjustment, {
-            value: index,
-            time: WORKSPACE_SWITCH_TIME,
-            transition: 'easeOutQuad',
-            onComplete: Lang.bind(this,
-                                  function() {
-                                      this._animatingScroll = false;
-                                  })
-        });
+        if (showAnimation) {
+            Tweener.addTween(this.scrollAdjustment, {
+               value: index,
+               time: WORKSPACE_SWITCH_TIME,
+               transition: 'easeOutQuad',
+               onComplete: Lang.bind(this,
+                   function() {
+                       this._animatingScroll = false;
+                   })
+            });
+        } else {
+            this.scrollAdjustment.value = index;
+            this._animatingScroll = false;
+        }
     },
 
     updateWorkspaces: function(oldNumWorkspaces, newNumWorkspaces) {
@@ -311,7 +323,7 @@ const WorkspacesView = new Lang.Class({
         if (this._scrolling)
             return;
 
-        this._scrollToActive();
+        this._scrollToActive(true);
     },
 
     _onDestroy: function() {
@@ -364,6 +376,9 @@ const WorkspacesView = new Lang.Class({
             this._firstDragMotion = false;
             for (let i = 0; i < this._workspaces.length; i++)
                 this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
+            if (!this._extraWorkspaces)
+                return DND.DragMotionResult.CONTINUE;
+
             for (let i = 0; i < this._extraWorkspaces.length; i++)
                 this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
         }
@@ -377,6 +392,9 @@ const WorkspacesView = new Lang.Class({
 
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].setReservedSlot(null);
+
+        if (!this._extraWorkspaces)
+            return;
         for (let i = 0; i < this._extraWorkspaces.length; i++)
             this._extraWorkspaces[i].setReservedSlot(null);
     },
@@ -385,11 +403,24 @@ const WorkspacesView = new Lang.Class({
         this._scrolling = true;
     },
 
-    endSwipeScroll: function() {
+    endSwipeScroll: function(result) {
         this._scrolling = false;
 
+        if (result == Overview.SwipeScrollResult.CLICK) {
+            let [x, y, mod] = global.get_pointer();
+            let actor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
+                                                      x, y);
+
+            // Only switch to the workspace when there's no application
+            // windows open. The problem is that it's too easy to miss
+            // an app window and get the wrong one focused.
+            let active = global.screen.get_active_workspace_index();
+            if (this._workspaces[active].isEmpty() &&
+                this.actor.contains(actor))
+                Main.overview.hide();
+        }
+
         // Make sure title captions etc are shown as necessary
-        this._scrollToActive();
         this._updateVisibility();
     },
 
@@ -437,51 +468,14 @@ const WorkspacesDisplay = new Lang.Class({
     Name: 'WorkspacesDisplay',
 
     _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'workspaces-display' });
+        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('notify::mapped', Lang.bind(this, this._setupSwipeScrolling));
         this.actor.connect('parent-set', Lang.bind(this, this._parentSet));
         this.actor.set_clip_to_allocation(true);
 
-        this._spacing = 0;
-        this.actor.connect('style-changed', Lang.bind(this,
-            function() {
-                let node = this.actor.get_theme_node();
-                let spacing = node.get_length('spacing');
-                if (spacing != this._spacing) {
-                    this._spacing = spacing;
-                    this._updateWorkspacesGeometry();
-                }
-            }));
-
-        let clickAction = new Clutter.ClickAction()
-        clickAction.connect('clicked', Lang.bind(this, function(action) {
-            // Only switch to the workspace when there's no application
-            // windows open. The problem is that it's too easy to miss
-            // an app window and get the wrong one focused.
-            if (action.get_button() == 1 &&
-                this._getPrimaryView().getActiveWorkspace().isEmpty())
-                Main.overview.hide();
-        }));
-        Main.overview.addAction(clickAction);
-        this.actor.bind_property('mapped', clickAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);
-
-        let panAction = new Clutter.PanAction();
-        panAction.connect('pan', Lang.bind(this, this._onPan));
-        panAction.connect('gesture-begin', Lang.bind(this, function() {
-            for (let i = 0; i < this._workspacesViews.length; i++)
-                this._workspacesViews[i].startSwipeScroll();
-            return true;
-        }));
-        panAction.connect('gesture-end', Lang.bind(this, function() {
-            clickAction.release();
-            for (let i = 0; i < this._workspacesViews.length; i++)
-                this._workspacesViews[i].endSwipeScroll();
-        }));
-        Main.overview.addAction(panAction);
-        this.actor.bind_property('mapped', panAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);
-
         let controls = new St.Bin({ style_class: 'workspace-controls',
                                     request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT,
                                     y_align: St.Align.START,
@@ -493,14 +487,15 @@ const WorkspacesDisplay = new Lang.Class({
         controls.track_hover = true;
         controls.connect('notify::hover',
                          Lang.bind(this, this._onControlsHoverChanged));
+        controls.connect('scroll-event',
+                         Lang.bind(this, this._onScrollEvent));
 
         this._primaryIndex = Main.layoutManager.primaryIndex;
 
         this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
         controls.add_actor(this._thumbnailsBox.actor);
 
-        this._workspacesViews = [];
-        this._workspaces = [];
+        this._workspacesViews = null;
         this._primaryScrollAdjustment = null;
 
         this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
@@ -548,13 +543,6 @@ const WorkspacesDisplay = new Lang.Class({
         this._swipeScrollEndId = 0;
     },
 
-    _onPan: function(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
-        let adjustment = this._scrollAdjustment;
-        adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
-        return false;
-    },
-
     show: function() {
         if(!this._alwaysZoomOut) {
             let [mouseX, mouseY] = global.get_pointer();
@@ -574,11 +562,12 @@ const WorkspacesDisplay = new Lang.Class({
         this._updateZoom();
 
         this._controls.show();
+        this._thumbnailsBox.show();
 
         this._updateWorkspacesViews();
 
         this._restackedNotifyId =
-            Main.overview.connect('windows-restacked',
+            global.screen.connect('restacked',
                                   Lang.bind(this, this._onRestacked));
 
         if (this._itemDragBeginId == 0)
@@ -599,6 +588,8 @@ const WorkspacesDisplay = new Lang.Class({
         if (this._windowDragEndId == 0)
             this._windowDragEndId = Main.overview.connect('window-drag-end',
                                                           Lang.bind(this, this._dragEnd));
+
+        this._onRestacked();
     },
 
     zoomFromOverview: function() {
@@ -609,12 +600,13 @@ const WorkspacesDisplay = new Lang.Class({
 
     hide: function() {
         this._controls.hide();
+        this._thumbnailsBox.hide();
 
         if (!this._alwaysZoomOut)
             this.zoomFraction = 0;
 
         if (this._restackedNotifyId > 0){
-            Main.overview.disconnect(this._restackedNotifyId);
+            global.screen.disconnect(this._restackedNotifyId);
             this._restackedNotifyId = 0;
         }
         if (this._itemDragBeginId > 0) {
@@ -644,7 +636,7 @@ const WorkspacesDisplay = new Lang.Class({
 
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
-        this._workspacesViews = [];
+        this._workspacesViews = null;
 
         for (let i = 0; i < this._workspaces.length; i++)
             for (let w = 0; w < this._workspaces[i].length; w++) {
@@ -653,6 +645,33 @@ const WorkspacesDisplay = new Lang.Class({
             }
     },
 
+    _setupSwipeScrolling: function() {
+        if (this._swipeScrollBeginId)
+            Main.overview.disconnect(this._swipeScrollBeginId);
+        this._swipeScrollBeginId = 0;
+
+        if (this._swipeScrollEndId)
+            Main.overview.disconnect(this._swipeScrollEndId);
+        this._swipeScrollEndId = 0;
+
+        if (!this.actor.mapped)
+            return;
+
+        let direction = Overview.SwipeScrollDirection.VERTICAL;
+        Main.overview.setScrollAdjustment(this._scrollAdjustment,
+                                          direction);
+        this._swipeScrollBeginId = Main.overview.connect('swipe-scroll-begin',
+            Lang.bind(this, function() {
+                for (let i = 0; i < this._workspacesViews.length; i++)
+                    this._workspacesViews[i].startSwipeScroll();
+            }));
+        this._swipeScrollEndId = Main.overview.connect('swipe-scroll-end',
+           Lang.bind(this, function(overview, result) {
+                for (let i = 0; i < this._workspacesViews.length; i++)
+                    this._workspacesViews[i].endSwipeScroll(result);
+           }));
+    },
+
     _workspacesOnlyOnPrimaryChanged: function() {
         this._workspacesOnlyOnPrimary = this._settings.get_boolean('workspaces-only-on-primary');
 
@@ -663,12 +682,14 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _updateWorkspacesViews: function() {
-        for (let i = 0; i < this._workspacesViews.length; i++)
-            this._workspacesViews[i].destroy();
+        if (this._workspacesViews)
+            for (let i = 0; i < this._workspacesViews.length; i++)
+                this._workspacesViews[i].destroy();
 
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++)
-                this._workspaces[i][w].destroy();
+        if (this._workspaces)
+            for (let i = 0; i < this._workspaces.length; i++)
+                for (let w = 0; w < this._workspaces[i].length; w++)
+                    this._workspaces[i][w].destroy();
 
         this._workspacesViews = [];
         this._workspaces = [];
@@ -690,6 +711,7 @@ const WorkspacesDisplay = new Lang.Class({
                 this._scrollAdjustment = view.scrollAdjustment;
                 this._scrollAdjustment.connect('notify::value',
                                                Lang.bind(this, this._scrollValueChanged));
+                this._setupSwipeScrolling();
             }
             this._workspacesViews.push(view);
         }
@@ -716,7 +738,7 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _getPrimaryView: function() {
-        if (!this._workspacesViews.length)
+        if (!this._workspacesViews)
             return null;
         if (this._workspacesOnlyOnPrimary)
             return this._workspacesViews[0];
@@ -825,7 +847,7 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _updateWorkspacesGeometry: function() {
-        if (!this._workspacesViews.length)
+        if (!this._workspacesViews)
             return;
 
         let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
@@ -842,23 +864,28 @@ const WorkspacesDisplay = new Lang.Class({
         let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
 
         let clipWidth = width - controlsVisible;
-        let clipHeight = fullHeight;
+        let clipHeight = (fullHeight / fullWidth) * clipWidth;
         let clipX = rtl ? x + controlsVisible : x;
         let clipY = y + (fullHeight - clipHeight) / 2;
 
         let widthAdjust = this._zoomOut ? controlsNatural : controlsVisible;
-        widthAdjust += this._spacing;
         width -= widthAdjust;
         if (rtl)
             x += widthAdjust;
 
+        height = (fullHeight / fullWidth) * width;
+        let difference = fullHeight - height;
+        y += difference / 2;
+
+
         let monitors = Main.layoutManager.monitors;
         let m = 0;
         for (let i = 0; i < monitors.length; i++) {
             if (i == this._primaryIndex) {
                 this._workspacesViews[m].setClipRect(clipX, clipY,
                                                      clipWidth, clipHeight);
-                this._workspacesViews[m].setGeometry(x, y, width, height);
+                this._workspacesViews[m].setGeometry(x, y, width, height,
+                                                     difference);
                 m++;
             } else if (!this._workspacesOnlyOnPrimary) {
                 this._workspacesViews[m].setClipRect(monitors[i].x,
@@ -868,22 +895,32 @@ const WorkspacesDisplay = new Lang.Class({
                 this._workspacesViews[m].setGeometry(monitors[i].x,
                                                      monitors[i].y,
                                                      monitors[i].width,
-                                                     monitors[i].height);
+                                                     monitors[i].height, 0);
                 m++;
             }
         }
     },
 
-    _onRestacked: function(overview, stackIndices) {
+    _onRestacked: function() {
+        let stack = global.get_window_actors();
+        let stackIndices = {};
+
+        for (let i = 0; i < stack.length; i++) {
+            // Use the stable sequence for an integer to use as a hash key
+            stackIndices[stack[i].get_meta_window().get_stable_sequence()] = i;
+        }
+
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].syncStacking(stackIndices);
+
+        this._thumbnailsBox.syncStacking(stackIndices);
     },
 
     _workspacesChanged: function() {
         this._updateAlwaysZoom();
         this._updateZoom();
 
-        if (!this._workspacesViews.length)
+        if (this._workspacesViews == null)
             return;
 
         let oldNumWorkspaces = this._workspaces[0].length;
@@ -907,6 +944,8 @@ const WorkspacesDisplay = new Lang.Class({
                 }
                 m++;
             }
+
+            this._thumbnailsBox.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
         } else {
             // Assume workspaces are only removed sequentially
             // (e.g. 2,3,4 - not 2,4,7)
@@ -929,6 +968,8 @@ const WorkspacesDisplay = new Lang.Class({
                     lostWorkspaces[l].destroy();
                 }
             }
+
+            this._thumbnailsBox.removeThumbnails(removedIndex, removedNum);
         }
 
         for (let i = 0; i < this._workspacesViews.length; i++)
@@ -945,7 +986,7 @@ const WorkspacesDisplay = new Lang.Class({
             this._zoomOut = shouldZoom;
             this._updateWorkspacesGeometry();
 
-            if (!this._workspacesViews.length)
+            if (!this._workspacesViews)
                 return;
 
             Tweener.addTween(this,
@@ -996,6 +1037,17 @@ const WorkspacesDisplay = new Lang.Class({
         // might as well avoid it.
         Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
                        Lang.bind(this, this._updateZoom));
+    },
+
+    _onScrollEvent: function (actor, event) {
+        switch ( event.get_scroll_direction() ) {
+        case Clutter.ScrollDirection.UP:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            break;
+        case Clutter.ScrollDirection.DOWN:
+            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            break;
+        }
     }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);

po/POTFILES.in

@@ -17,7 +17,6 @@ js/ui/components/networkAgent.js
 js/ui/components/polkitAgent.js
 js/ui/components/recorder.js
 js/ui/components/telepathyClient.js
-js/ui/ctrlAltTab.js
 js/ui/dash.js
 js/ui/dateMenu.js
 js/ui/endSessionDialog.js

po/ca.po

@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-25 10:59+0000\n"
-"PO-Revision-Date: 2012-09-25 07:47+0100\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-03 16:22+0100\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -141,50 +141,63 @@ msgstr ""
 "l'usuari. El valor prové de l'enumeració «GsmPresenceStatus»."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Mostra sempre l'element de menú «Surt» en el menú d'usuari."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Aquesta clau sobreescriu l'ocultació automàtica de l'element de menú «Surt» "
+"en el menú d'usuari en el cas que només hi hagi un sol usuari i una sola "
+"sessió."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostra el número de la setmana en el calendari"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Si és «true» (cert) es mostra el número de la setmana en el calendari."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Vinculació per obrir el menú d'aplicació"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "La vinculació per obrir el menú d'aplicació."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "La vinculació per commutar la visibilitat de la safata de missatges"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "La vinculació per commutar la visibilitat de la safata de missatges."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "La vinculació per commutar l'enregistrador de pantalla"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "La vinculació per iniciar/aturar l'enregistrador de pantalla."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Quin tipus de teclat s'ha d'utilitzar"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "El tipus de teclat que s'utilitzarà."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Imatges per segon per enregistrar els screencasts."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -192,11 +205,11 @@ msgstr ""
 "Les imatges per segon, en fotogrames per segon, de l'screencast enregistrat "
 "per l'eina d'enregistrament del GNOME Shell."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "El conducte GStreamer per enregistrar els screencasts"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -223,11 +236,11 @@ msgstr ""
 "WEBM i utilitza el còdec VP8. El %T és una variable per estimar el nombre de "
 "fils d'execució paral·lels òptims del sistema."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Extensió de fitxer per desar l'screencast"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -250,11 +263,11 @@ msgstr "Extensió"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Seleccioneu una extensió amb el quadre combinat per configurar-la."
 
-#: ../js/gdm/loginDialog.js:528
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Sessió..."
 
-#: ../js/gdm/loginDialog.js:676
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Entrada"
@@ -262,23 +275,23 @@ msgstr "Entrada"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:743
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "No esteu llistat?"
 
-#: ../js/gdm/loginDialog.js:896 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../js/gdm/loginDialog.js:901
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Entra"
 
-#: ../js/gdm/loginDialog.js:1240
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Finestra d'entrada"
 
@@ -287,8 +300,8 @@ msgstr "Finestra d'entrada"
 msgid "Power"
 msgstr "Apaga"
 
-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Atura temporalment"
 
@@ -296,8 +309,8 @@ msgstr "Atura temporalment"
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Apaga"
 
@@ -348,7 +361,7 @@ msgstr "CONFIGURACIÓ"
 msgid "New Window"
 msgstr "Finestra nova"
 
-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "Suprimeix dels preferits"
 
@@ -512,16 +525,16 @@ msgstr "Aquesta setmana"
 msgid "Next week"
 msgstr "La setmana que ve"
 
-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Dispositius extraïbles"
 
-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Obre amb %s"
 
-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Expulsa"
 
@@ -678,35 +691,35 @@ msgstr "Silencia"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Enviat a les <b>%X</b> del <b>%A</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Enviat el <b>%A %d de %B</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Enviat el <b>%A %d de %B</b> de %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "En/na %s ara es diu %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Us han convidat a entrar a %s"
@@ -714,42 +727,42 @@ msgstr "Us han convidat a entrar a %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "En/na %s us convida a entrar a %s"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Declina"
 
-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Accepta"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Videotrucada de %s"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Trucada de %s"
 
-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Rebutja"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Contesta"
 
@@ -758,112 +771,112 @@ msgstr "Contesta"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "En/na %s us envia %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vol poder saber quan esteu en línia"
 
-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Error d'encriptació"
 
-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "No s'ha proporcionat el certificat"
 
-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "El certificat no és de confiança"
 
-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "El certificat ha vençut"
 
-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "El certificat no està activat"
 
-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "No coincideix el nom de la màquina del certificat"
 
-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "No coincideix l'empremta digital del certificat"
 
-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certificat signat per un mateix"
 
-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "S'ha establert l'estat a fora de línia"
 
-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "L'encriptació no està disponible"
 
-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "El certificat no és vàlid"
 
-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "S'ha rebutjat la connexió"
 
-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "No es pot establir la connexió"
 
-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "S'ha perdut la connexió"
 
-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Aquest compte ja està connectat al servidor"
 
-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix "
 "recurs"
 
-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Ja existeix aquest compte al servidor"
 
-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "El servidor està massa ocupat per gestionar la connexió"
 
-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "S'ha revocat el certificat"
 
-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificat utilitza un algorisme criptògraf no segur o la seva fortalesa "
 "criptogràfica és feble"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -871,30 +884,30 @@ msgstr ""
 "La llargada del certificat del servidor o la profunditat de la cadena de "
 "certificació excedeix els límits de la biblioteca criptogràfica"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "S'ha produït un error intern"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Ha fallat la connexió a %s"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Torna a connectar"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Edita el compte"
 
-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Mostra les aplicacions"
 
@@ -902,14 +915,14 @@ msgstr "Mostra les aplicacions"
 msgid "Date and Time Settings"
 msgstr "Configuració de la data i l'hora"
 
-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Obre el calendari"
 
 #. 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").
 #.
-#: ../js/ui/dateMenu.js:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A %d de %B, %Y"
 
@@ -1068,23 +1081,23 @@ msgstr "Mostra el codi font"
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Obre"
 
-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: ../js/ui/messageTray.js:2088
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Safata de missatges"
 
-#: ../js/ui/messageTray.js:2551
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Informació de l'ordinador"
 
-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconegut"
@@ -1140,7 +1153,7 @@ msgstr "Introduïu una ordre:"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A %d de %B"
 
@@ -1190,7 +1203,7 @@ msgstr "Contrasenya"
 msgid "Remember Password"
 msgstr "Recorda la contrasenya"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Desbloqueja"
 
@@ -1601,67 +1614,63 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Micròfon"
 
-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Entra amb un altre usuari"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Disponible"
 
-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Absent"
 
-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Inactiu"
 
-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Canvia d'usuari"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Canvia de sessió"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Paràmetres del sistema"
 
-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Canvia d'usuari"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Surt"
 
-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Bloqueja"
 
-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instal·la les actualitzacions i reinicia"
 
-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "L'estat del xat s'establirà a ocupat"
 
-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1682,7 +1691,7 @@ msgstr "Aplicacions"
 msgid "Search"
 msgstr "Cerca"
 
-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1691,12 +1700,12 @@ msgstr ""
 "No hi ha cap consell per avui:\n"
 "%s"
 
-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "L'oracle diu %s"
 
-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "El vostre ou de pasqua preferit"
 
@@ -1731,23 +1740,23 @@ msgstr[1] "%u entrades"
 msgid "System Sounds"
 msgstr "Sons del sistema"
 
-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Mostra la versió"
 
-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "El mode que utilitzarà el GDM per a la pantalla d'entrada"
 
-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Utilitza un mode específic, p. ex. «gdm» per la pantalla d'entrada"
 
-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Llista els modes possibles"
 
-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "No s'ha pogut iniciar «%s»"
@@ -1772,6 +1781,9 @@ msgstr "Predeterminat"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "L'usuari ha descartat el diàleg d'autenticació"
 
+#~ msgid "Switch Session"
+#~ msgstr "Canvia de sessió"
+
 #~ msgid "Failed to unmount '%s'"
 #~ msgstr "No s'ha pogut desmuntar «%s»"
 

po/cs.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-10-31 16:46+0000\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
 "PO-Revision-Date: 2012-11-04 17:40+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
@@ -40,14 +40,6 @@ msgstr "Systém"
 msgid "Show the message tray"
 msgstr "Zobrazit lištu zpráv"
 
-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Zobrazit všechny aplikace"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Otevřít nabídku aplikací"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "Prostředí GNOME Shell"
@@ -175,47 +167,34 @@ msgid "Keybinding to open the application menu."
 msgstr "Klávesová zkratka na otevření nabídky aplikace."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
-#, fuzzy
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Klávesová zkratka na otevření nabídky aplikace"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-#, fuzzy
-#| msgid "Keybinding to open the application menu."
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Klávesová zkratka na otevření nabídky aplikace."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Klávesová zkratka k záznamu obrazovky"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Klávesová zkratka k započnutí nebo ukončení záznamu dění na obrazovce."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Která klávesnice se má používat"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Typ klávesnice, který se má používat."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Frekvence snímků při nahrávání dění na obrazovce."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -223,11 +202,11 @@ msgstr ""
 "Frekvence snímků za sekundu výsledné nahrávky dění na obrazovce, která byla "
 "nahrána záznamovým programem GNOME Shell."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Roura systému gstreamer určená ke kódování nahrávky dění na obrazovce"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -252,11 +231,11 @@ msgstr ""
 "nahráváním do WEBM s kodekem VP8. %T je použito jako zástupný symbol odhadu "
 "nejvhodnějšího počtu vláken na systému."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Přípona souboru s nahrávkou dění na obrazovce"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -266,39 +245,6 @@ msgstr ""
 "názvu vycházejícího z aktuálního data a bude používat tuto příponu. Při "
 "nahrávání do jiného formátu kontejneru by měla být provedena úprava pravidel."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "Attach modal dialog to the parent window"
-msgstr "Připojovat modální dialogová okna k rodičovským oknům"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Tento kíč přepisuje klíč v org.gnome.mutter, když běží GNOME Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Uspořádání tlačítek v záhlaví"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Tento kíč přepisuje klíč v org.gnome.desktop.wm.preferences, když běží GNOME Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
-msgid "Workspaces are managed dynamically"
-msgstr "Pracovní plochy jsou spravovány dynamicky"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
-msgid "Workspaces only on primary monitor"
-msgstr "Pracovní plochy pouze na hlavním monitoru"
-
 #: ../js/extensionPrefs/main.js:124
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@@ -314,11 +260,11 @@ msgid "Select an extension to configure using the combobox above."
 msgstr ""
 "Pomocí rozbalovacího seznamu výše zvolte rozšíření, které chete nastavit."
 
-#: ../js/gdm/loginDialog.js:560
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Sezení…"
 
-#: ../js/gdm/loginDialog.js:704
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Přihlášení"
@@ -326,56 +272,56 @@ msgstr "Přihlášení"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:763
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"
 
-#: ../js/gdm/loginDialog.js:905 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:168
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../js/gdm/loginDialog.js:910
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"
 
-#: ../js/gdm/loginDialog.js:1221
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Přihlašovací okno"
 
 #. Translators: accessible name of the power menu in the login screen
-#: ../js/gdm/powerMenu.js:36
+#: ../js/gdm/powerMenu.js:35
 msgid "Power"
 msgstr "Vypnout"
 
-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:667 ../js/ui/userMenu.js:671
-#: ../js/ui/userMenu.js:782
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Uspat do paměti"
 
-#: ../js/gdm/powerMenu.js:98
+#: ../js/gdm/powerMenu.js:94
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:669
-#: ../js/ui/userMenu.js:671 ../js/ui/userMenu.js:781
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Vypnout"
 
-#: ../js/gdm/util.js:151
+#: ../js/gdm/util.js:148
 msgid "Authentication error"
 msgstr "Chyba ověření"
 
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:268
+#: ../js/gdm/util.js:265
 msgid "(or swipe finger)"
 msgstr "(nebo otiskněte prst)"
 
-#: ../js/gdm/util.js:293
+#: ../js/gdm/util.js:290
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"
@@ -545,48 +491,48 @@ msgid "S"
 msgstr "So"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:700
+#: ../js/ui/calendar.js:699
 msgid "Nothing Scheduled"
 msgstr "Nic nenaplánováno"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:716
+#: ../js/ui/calendar.js:715
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:719
+#: ../js/ui/calendar.js:718
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../js/ui/calendar.js:729
+#: ../js/ui/calendar.js:728
 msgid "Today"
 msgstr "Dnes"
 
-#: ../js/ui/calendar.js:733
+#: ../js/ui/calendar.js:732
 msgid "Tomorrow"
 msgstr "Zítra"
 
-#: ../js/ui/calendar.js:744
+#: ../js/ui/calendar.js:743
 msgid "This week"
 msgstr "Tento týden"
 
-#: ../js/ui/calendar.js:752
+#: ../js/ui/calendar.js:751
 msgid "Next week"
 msgstr "Následující týden"
 
-#: ../js/ui/components/autorunManager.js:295
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Výměnná zařízení"
 
-#: ../js/ui/components/autorunManager.js:591
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Otevřít s %s"
 
-#: ../js/ui/components/autorunManager.js:617
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Vysunout"
 
@@ -740,42 +686,38 @@ msgstr "Zrušit ztlumení"
 msgid "Mute"
 msgstr "Ztlumit"
 
-#. Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"
-#: ../js/ui/components/telepathyClient.js:943
+#. Translators: this is a time format string followed by a date.
+#. If applicable, replace %X with a strftime format valid for your
+#. locale, without seconds.
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
-msgid "<b>%H:%M</b> on Yesterday"
-msgstr ""
+msgid "Sent at <b>%X</b> on <b>%A</b>"
+msgstr "Čas odeslání: <b>%X</b>, den odeslání: <b>%A</b>"
 
-#. Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday
-#: ../js/ui/components/telepathyClient.js:949
+#. Translators: this is a time format in the style of "Wednesday, May 25",
+#. shown when you get a chat message in the same year.
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>"
-msgstr "<b>%H:%M</b> v <b>%A</b>"
+msgid "Sent on <b>%A</b>, <b>%B %d</b>"
+msgstr "Den odeslání: <b>%A</b>, <b>%e. %B</b>"
 
-#. Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
-#. shown when you get a chat message in the same year
-#: ../js/ui/components/telepathyClient.js:955
+#. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
+#. shown when you get a chat message in a different year.
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"
-msgstr "<b>%H:%M</b> v <b>%A</b>, <b>%e. %B</b>"
-
-#. Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
-#. shown when you get a chat message in a different year
-#: ../js/ui/components/telepathyClient.js:960
-#, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
-msgstr "<b>%H:%M</b> v <b>%A</b>, <b>%e. %B</b> %Y"
+msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
+msgstr "Den odeslání: <b>%A</b>, <b>%e. %B</b> %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1087
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Pozvánka na připojení k %s"
@@ -783,42 +725,42 @@ msgstr "Pozvánka na připojení k %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1095
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás zve do %s"
 
-#: ../js/ui/components/telepathyClient.js:1097
-#: ../js/ui/components/telepathyClient.js:1176
-#: ../js/ui/components/telepathyClient.js:1239
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Přijmout"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1128
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Videohovor od %s"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1131
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Hovor od %s"
 
-#: ../js/ui/components/telepathyClient.js:1136
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Odmítnout"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1138
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Zvednout"
 
@@ -827,110 +769,110 @@ msgstr "Zvednout"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1170
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s vám posílá %s"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1205
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vás žádá o oprávnění vidět, že jste dostupní"
 
-#: ../js/ui/components/telepathyClient.js:1297
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Chyba sítě"
 
-#: ../js/ui/components/telepathyClient.js:1299
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ověření selhalo"
 
-#: ../js/ui/components/telepathyClient.js:1301
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../js/ui/components/telepathyClient.js:1303
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Certifikát neposkytnut"
 
-#: ../js/ui/components/telepathyClient.js:1305
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../js/ui/components/telepathyClient.js:1307
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../js/ui/components/telepathyClient.js:1309
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"
 
-#: ../js/ui/components/telepathyClient.js:1311
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Název počítače certifikátu nesouhlasí"
 
-#: ../js/ui/components/telepathyClient.js:1313
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisk prstu certifikátu nesouhlasí"
 
-#: ../js/ui/components/telepathyClient.js:1315
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"
 
-#: ../js/ui/components/telepathyClient.js:1317
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Stav nastaven na „Odhlášen“"
 
-#: ../js/ui/components/telepathyClient.js:1319
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"
 
-#: ../js/ui/components/telepathyClient.js:1321
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
-#: ../js/ui/components/telepathyClient.js:1323
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"
 
-#: ../js/ui/components/telepathyClient.js:1325
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Spojení nemohlo bát navázáno"
 
-#: ../js/ui/components/telepathyClient.js:1327
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"
 
-#: ../js/ui/components/telepathyClient.js:1329
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Tento účet je již připojen k serveru"
 
-#: ../js/ui/components/telepathyClient.js:1331
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"
 
-#: ../js/ui/components/telepathyClient.js:1333
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Takový účet již na serveru existuje"
 
-#: ../js/ui/components/telepathyClient.js:1335
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"
 
-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"
 
-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používá nepříliš bezpečný šifrovací algoritmus nebo je z "
 "kryptografického hlediska slabý"
 
-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -938,26 +880,26 @@ msgstr ""
 "Délka certifikátu serveru nebo délka zřetězených certifikátů serveru "
 "přesáhla omezení dané kryptografickou knihovnou"
 
-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Připojení k „%s“ selhalo"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Znovu připojit"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Upravit účet"
 
-#: ../js/ui/components/telepathyClient.js:1408
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -1140,23 +1082,23 @@ msgstr "Zobrazit zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"
 
-#: ../js/ui/messageTray.js:1083
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Otevřít"
 
-#: ../js/ui/messageTray.js:1090
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ../js/ui/messageTray.js:1534
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Lišta zpráv"
 
-#: ../js/ui/messageTray.js:2557
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Informace o systému"
 
-#: ../js/ui/notificationDaemon.js:504 ../src/shell-app.c:374
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámé"
@@ -1183,17 +1125,17 @@ msgstr "Vyhledávejte psaním…"
 msgid "Dash"
 msgstr "Oblíbené"
 
-#: ../js/ui/panel.js:580
+#: ../js/ui/panel.js:567
 msgid "Quit"
 msgstr "Ukončit"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:612
+#: ../js/ui/panel.js:599
 msgid "Activities"
 msgstr "Činnosti"
 
-#: ../js/ui/panel.js:979
+#: ../js/ui/panel.js:965
 msgid "Top Bar"
 msgstr "Horní lišta"
 
@@ -1207,12 +1149,8 @@ msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
 #: ../js/ui/runDialog.js:205
-msgid "Enter a Command"
-msgstr "Zadejte příkaz:"
-
-#: ../js/ui/runDialog.js:241
-msgid "Close"
-msgstr ""
+msgid "Please enter a command:"
+msgstr "Zadejte prosím příkaz:"
 
 #. Translators: This is a time format for a date in
 #. long format
@@ -1268,7 +1206,7 @@ msgstr "Heslo"
 msgid "Remember Password"
 msgstr "Pamatovat si heslo"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:171
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Odemknout"
 
@@ -1323,7 +1261,7 @@ msgstr "Styl velkého textu"
 #: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
 #: ../js/ui/status/bluetooth.js:251 ../js/ui/status/bluetooth.js:304
 #: ../js/ui/status/bluetooth.js:335 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:873
+#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:867
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -1352,12 +1290,12 @@ msgstr "zařízení zakázáno"
 msgid "Connection"
 msgstr "Připojení"
 
-#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:475
+#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:458
 msgid "disconnecting..."
 msgstr "odpojování…"
 
-#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:481
-#: ../js/ui/status/network.js:1507
+#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:934
 msgid "connecting..."
 msgstr "připojování…"
 
@@ -1467,106 +1405,109 @@ msgstr "zakázáno"
 
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:473
+#: ../js/ui/status/network.js:456
 msgid "unmanaged"
 msgstr "nespravováno"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:484 ../js/ui/status/network.js:1510
+#: ../js/ui/status/network.js:467 ../js/ui/status/network.js:937
 msgid "authentication required"
 msgstr "je vyžadováno ověření"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:494
+#: ../js/ui/status/network.js:477
 msgid "firmware missing"
 msgstr "nedostupný firmware"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:501
+#: ../js/ui/status/network.js:484
 msgid "cable unplugged"
 msgstr "kabel byl odpojen"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:506
+#: ../js/ui/status/network.js:489
 msgid "unavailable"
 msgstr "nedostupné"
 
-#: ../js/ui/status/network.js:508 ../js/ui/status/network.js:1512
+#: ../js/ui/status/network.js:491 ../js/ui/status/network.js:939
 msgid "connection failed"
 msgstr "připojení selhalo"
 
-#: ../js/ui/status/network.js:560 ../js/ui/status/network.js:1446
-#: ../js/ui/status/network.js:1588
+#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1529
 msgid "More..."
 msgstr "Více…"
 
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:596 ../js/ui/status/network.js:1376
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1459
 msgid "Connected (private)"
 msgstr "Připojení (soukromé)"
 
-#: ../js/ui/status/network.js:669
+#: ../js/ui/status/network.js:663
 msgid "Auto Ethernet"
 msgstr "Automatické Ethernet"
 
-#: ../js/ui/status/network.js:727
+#: ../js/ui/status/network.js:721
 msgid "Auto broadband"
 msgstr "Automatické širokopásmové"
 
-#: ../js/ui/status/network.js:730
+#: ../js/ui/status/network.js:724
 msgid "Auto dial-up"
 msgstr "Automatické vytáčené"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:859 ../js/ui/status/network.js:1393
+#: ../js/ui/status/network.js:853 ../js/ui/status/network.js:1476
 #, c-format
 msgid "Auto %s"
 msgstr "Automatické %s"
 
-#: ../js/ui/status/network.js:861
+#: ../js/ui/status/network.js:855
 msgid "Auto bluetooth"
 msgstr "Automatické Bluetooth"
 
-#: ../js/ui/status/network.js:1395
+#: ../js/ui/status/network.js:1478
 msgid "Auto wireless"
 msgstr "Automatické bezdrátové"
 
-#: ../js/ui/status/network.js:1637
+#: ../js/ui/status/network.js:1575
 msgid "Enable networking"
 msgstr "Povolit síť"
 
-#: ../js/ui/status/network.js:1659
+#: ../js/ui/status/network.js:1597
 msgid "Wired"
 msgstr "Drátová"
 
-#: ../js/ui/status/network.js:1670
+#: ../js/ui/status/network.js:1608
 msgid "Wireless"
 msgstr "Bezdrátová"
 
-#: ../js/ui/status/network.js:1680
+#: ../js/ui/status/network.js:1618
 msgid "Mobile broadband"
 msgstr "Mobilní širokopásmová"
 
-#: ../js/ui/status/network.js:1691
+#: ../js/ui/status/network.js:1628
+msgid "VPN Connections"
+msgstr "Připojení k VPN"
+
+#: ../js/ui/status/network.js:1635
 msgid "Network Settings"
 msgstr "Nastavení sítě"
 
-#: ../js/ui/status/network.js:1735
+#: ../js/ui/status/network.js:1679
 msgid "Network Manager"
 msgstr "Network Manager"
 
-#: ../js/ui/status/network.js:1809
+#: ../js/ui/status/network.js:1769
 msgid "Connection failed"
 msgstr "Připojení selhalo"
 
-#: ../js/ui/status/network.js:1810
+#: ../js/ui/status/network.js:1770
 msgid "Activation of network connection failed"
 msgstr "Aktivace síťového připojení selhala"
 
-#: ../js/ui/status/network.js:2108
+#: ../js/ui/status/network.js:2065
 msgid "Networking is disabled"
 msgstr "Síť je zakázána"
 
@@ -1680,63 +1621,63 @@ msgstr "Hlasitost"
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../js/ui/unlockDialog.js:178
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Přihlásit se jako jiný uživatel"
 
-#: ../js/ui/userMenu.js:176
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../js/ui/userMenu.js:179
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../js/ui/userMenu.js:182
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../js/ui/userMenu.js:185
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Nepřítomen"
 
-#: ../js/ui/userMenu.js:188
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Nečinný"
 
-#: ../js/ui/userMenu.js:191
-msgid "Offline"
-msgstr "Odpojen"
+#: ../js/ui/userMenu.js:196
+msgid "Unavailable"
+msgstr "Nedostupný"
 
-#: ../js/ui/userMenu.js:747
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../js/ui/userMenu.js:755
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Nastavení systému"
 
-#: ../js/ui/userMenu.js:763
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Přepnout uživatele"
 
-#: ../js/ui/userMenu.js:768
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Odhlásit se"
 
-#: ../js/ui/userMenu.js:773
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Uzamknout"
 
-#: ../js/ui/userMenu.js:788
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Nainstalovat aktualizace a restartovat"
 
-#: ../js/ui/userMenu.js:806
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Váš stav v konverzacích byl nastaven na „Zaneprázdněn“"
 
-#: ../js/ui/userMenu.js:807
+#: ../js/ui/userMenu.js:804
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1744,15 +1685,15 @@ msgstr ""
 "Upozornění jsou nyní vypnuta, včetně zpráv v konverzacích. Váš stav on-line "
 "byl změněn tak, aby ostatní věděli, že si jejich zprávy nemusíte přečíst."
 
-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Okna"
 
-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Aplikace"
 
-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Hledat"
 

po/et.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-09 13:03+0000\n"
-"PO-Revision-Date: 2012-12-19 16:47+0300\n"
+"POT-Creation-Date: 2012-10-17 17:06+0000\n"
+"PO-Revision-Date: 2012-10-18 00:49+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -37,15 +37,6 @@ msgstr "Arvuti"
 msgid "Show the message tray"
 msgstr "Teateala näitamine"
 
-msgid "Focus the active notification"
-msgstr "Aktiivse märguande fokuseerimine"
-
-msgid "Show all applications"
-msgstr "Kõigi rakenduste kuvamine"
-
-msgid "Open the application menu"
-msgstr "Rakenduste menüü avamine"
-
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
 
@@ -125,38 +116,6 @@ msgstr ""
 "Kasutatakse kasutaja poolt viimati vahetult määratud kiirsuhtluse oleku "
 "salvestamiseks. See väärtus pärineb GsmPresenceStatus nummerdusest."
 
-msgid "Always show the 'Log out' menuitem in the user menu."
-msgstr "Kasutajamenüüs näidatakse alati 'Logi välja' menüükirjet."
-
-msgid ""
-"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
-"user, single-session situations."
-msgstr ""
-"See võti keelab automaatse 'Logi välja' menüükirje peitmise, kui arvutis on "
-"üks kasutaja ning avatud üks seanss."
-
-msgid "Show full name in the user menu"
-msgstr "Kasutajamenüüs näidatakse kasutaja tervet nime"
-
-msgid "Whether the users full name is shown in the user menu or not."
-msgstr "Kas kasutajamenüüs näidatakse kasutaja kogu nime või mitte."
-
-msgid ""
-"Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
-"Kas pidada meeles krüpteeritud või kaugfailisüsteemide haakimise paroole."
-
-msgid ""
-"The shell will request a password when an encrypted device or a remote "
-"filesystem is mounted. If the password can be saved for future use a "
-"'Remember Password' checkbox will be present. This key sets the default "
-"state of the checkbox."
-msgstr ""
-"Shell küsib parooli, kui haagitakse krüpteeritud seade või kaugfailisüsteem. "
-"Kui parooli on võimalik salvestada edaspidiseks kasutuseks, näidatakse "
-"'Salvesta parool' märkeruutu. See võti määrab selle märkeruudu vaikimisi "
-"oleku."
-
 msgid "Show the week date in the calendar"
 msgstr "Kalendris näidatakse kuupäeva nädalavormingus"
 
@@ -169,25 +128,12 @@ msgstr "Rakenduste menüü avamise kiirklahv"
 msgid "Keybinding to open the application menu."
 msgstr "Kiirklahv  rakenduste menüü avamiseks."
 
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "\"Rakenduste vaate\" avamise kiirklahv"
-
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "\"Rakenduste vaate\" avamise kiirklahv tegevuste ülevaates."
-
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Teateala nähtavuse muutmise kiirklahv"
 
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Kiirklahv teateala nähtavuse muutmiseks."
 
-msgid "Keybinding to focus the active notification"
-msgstr "Aktiivse teate fokuseerimise kiirklahv"
-
-msgid "Keybinding to focus the active notification."
-msgstr "Aktiivse teate fokuseerimise kiirklahv."
-
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Erkaanilindistaja lülitamise kiirklahv"
 
@@ -249,46 +195,6 @@ msgstr ""
 "konteinervormingusse salvestades tuleks ka sellele vormingule vastav laiend "
 "määrata."
 
-msgid "The application icon mode."
-msgstr "Rakenduste ikooni režiim."
-
-msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
-msgstr ""
-"Seadistab, kuidas aknaid aknavahetajas kuvatakse. Sobivad väärtused on "
-"'thumbnail-only' (näidatakse ainult pisipilti aknast), 'app-icon-"
-"only' (näidatakse ainult akna ikooni) või 'both' (mõlemad)."
-
-msgid "Attach modal dialog to the parent window"
-msgstr "Modaaldialoog kuulub vanemakna juurde"
-
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"See võti on ülimuslik võtme org.gnome.mutter suhtes, kui kasutatakse GNOME "
-"Shelli."
-
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Nuppude järjekord tiitliribal"
-
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"See võti on ülimuslik võtme org.gnome.desktop.wm.preferences suhtes, kui "
-"kasutatakse GNOME Shelli."
-
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Akende lohistamisel ekraani serva lubatakse serva paigutamine"
-
-msgid "Workspaces are managed dynamically"
-msgstr "Tööalasid hallatakse dünaamiliselt"
-
-msgid "Workspaces only on primary monitor"
-msgstr "Tööalad peamisel monitoril"
-
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "%s jaoks eelistuste dialoogi laadimisel esines viga:"
@@ -317,16 +223,7 @@ msgstr "Katkesta"
 
 msgctxt "button"
 msgid "Sign In"
-msgstr "Logi sisse"
-
-msgid "Next"
-msgstr "Järgmine"
-
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
-msgid "Username: "
-msgstr "Kasutajanimi: "
+msgstr "Sisselogimine"
 
 msgid "Login Window"
 msgstr "Sisselogimisaken"
@@ -439,7 +336,7 @@ msgstr "K"
 #. Translators: Calendar grid abbreviation for Thursday
 msgctxt "grid thursday"
 msgid "T"
-msgstr "N"
+msgstr "T"
 
 #. Translators: Calendar grid abbreviation for Friday
 msgctxt "grid friday"
@@ -449,7 +346,7 @@ msgstr "R"
 #. Translators: Calendar grid abbreviation for Saturday
 msgctxt "grid saturday"
 msgid "S"
-msgstr "L"
+msgstr "P"
 
 #. Translators: Event list abbreviation for Sunday.
 #. *
@@ -489,7 +386,7 @@ msgstr "R"
 #. Translators: Event list abbreviation for Saturday
 msgctxt "list saturday"
 msgid "S"
-msgstr "L"
+msgstr "P"
 
 #. Translators: Text to show if there are no events
 msgid "Nothing Scheduled"
@@ -544,6 +441,12 @@ msgstr "Parool: "
 msgid "Key: "
 msgstr "Võti: "
 
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+msgid "Username: "
+msgstr "Kasutajanimi: "
+
 msgid "Identity: "
 msgstr "Identiteet: "
 
@@ -622,8 +525,11 @@ msgstr "Helista"
 msgid "File Transfer"
 msgstr "Failiülekanne"
 
-msgid "Chat"
-msgstr "Vestlus"
+msgid "Subscription request"
+msgstr "Tellimuse päring"
+
+msgid "Connection error"
+msgstr "Ühenduse viga"
 
 msgid "Unmute"
 msgstr "Heli peale"
@@ -631,25 +537,24 @@ msgstr "Heli peale"
 msgid "Mute"
 msgstr "Heli maha"
 
-#. Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"
+#. Translators: this is a time format string followed by a date.
+#. If applicable, replace %X with a strftime format valid for your
+#. locale, without seconds.
 #, no-c-format
-msgid "<b>Yesterday</b>, <b>%H:%M</b>"
-msgstr "<b>Eile</b> <b>%H:%M</b>"
+msgid "Sent at <b>%X</b> on <b>%A</b>"
+msgstr "Saadeti: <b>%a</b>, <b>%X</b>"
 
-#. Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30
+#. Translators: this is a time format in the style of "Wednesday, May 25",
+#. shown when you get a chat message in the same year.
 #, no-c-format
-msgid "<b>%A</b>, <b>%H:%M</b>"
-msgstr "<b>%A</b>, <b>%H:%M</b>"
+msgid "Sent on <b>%A</b>, <b>%B %d</b>"
+msgstr "Saadeti: <b>%a</b>, <b>d. %B</b>"
 
-#. Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"
+#. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
+#. shown when you get a chat message in a different year.
 #, no-c-format
-msgid "<b>%B</b> <b>%d</b>, <b>%H:%M</b>"
-msgstr "<b>%d. %B</b>, <b>%H:%M</b>"
-
-#. Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"
-#, no-c-format
-msgid "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "
-msgstr "<b>%d. %B %Y</b>, <b>%H:%M</b>"
+msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
+msgstr "Saadeti: <b>%a</b>, <b>d. %B</b>, %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
@@ -686,6 +591,9 @@ msgstr "%s tahab alustada videokõnet"
 msgid "Call from %s"
 msgstr "%s helistab"
 
+msgid "Reject"
+msgstr "Lükka tagasi"
+
 #. translators: this is a button label (verb), not a noun
 msgid "Answer"
 msgstr "Vasta"
@@ -786,18 +694,18 @@ msgstr "Sisemine viga"
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
 #, c-format
-msgid "Unable to connect to %s"
-msgstr "Pole võimalik ühenduda võrguga %s"
+msgid "Connection to %s failed"
+msgstr "Ühendus %s nurjus"
 
-msgid "View account"
-msgstr "Konto kuvamine"
+msgid "Reconnect"
+msgstr "Ühendu uuesti"
+
+msgid "Edit account"
+msgstr "Konto muutmine"
 
 msgid "Unknown reason"
 msgstr "Põhjus teadmata"
 
-msgid "Windows"
-msgstr "Aknad"
-
 msgid "Show Applications"
 msgstr "Rakenduste kuvamine"
 
@@ -844,11 +752,11 @@ msgstr "Süsteemist väljalogimine"
 
 msgctxt "button"
 msgid "Log Out"
-msgstr "Logi välja"
+msgstr "Väljalogimine"
 
 msgctxt "title"
 msgid "Power Off"
-msgstr "Väljalülitamine"
+msgstr "Lülita välja"
 
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
@@ -874,7 +782,7 @@ msgstr "Lülita välja"
 
 msgctxt "title"
 msgid "Restart"
-msgstr "Taaskäivitamine"
+msgstr "Taaskäivita"
 
 msgid "Click Restart to quit these applications and restart the system."
 msgstr ""
@@ -920,6 +828,8 @@ msgstr "Näita vigu"
 msgid "Enabled"
 msgstr "Lubatud"
 
+#. translators:
+#. * The device has been disabled
 msgid "Disabled"
 msgstr "Keelatud"
 
@@ -944,9 +854,6 @@ msgstr "Ava"
 msgid "Remove"
 msgstr "Eemalda"
 
-msgid "No Messages"
-msgstr "Teateid pole"
-
 msgid "Message Tray"
 msgstr "Teateala"
 
@@ -994,11 +901,8 @@ msgstr "Ülemine riba"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-msgid "Enter a Command"
-msgstr "Palun sisesta käsk"
-
-msgid "Close"
-msgstr "Sulge"
+msgid "Please enter a command:"
+msgstr "Palun sisesta käsk:"
 
 #. Translators: This is a time format for a date in
 #. long format
@@ -1017,9 +921,6 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d uus märguanne"
 msgstr[1] "%d uut märguannet"
 
-msgid "Lock"
-msgstr "Lukusta"
-
 msgid "Searching..."
 msgstr "Otsimine..."
 
@@ -1114,6 +1015,16 @@ msgstr "ühendumine..."
 msgid "Send Files..."
 msgstr "Failide saatmine..."
 
+msgid "Browse Files..."
+msgstr "Failide sirvimine..."
+
+msgid "Error browsing device"
+msgstr "Viga seadme sirvimisel"
+
+#, c-format
+msgid "The requested device cannot be browsed, error is '%s'"
+msgstr "Küsitud seadet pole võimalik sirvida, viga on '%s'"
+
 msgid "Keyboard Settings"
 msgstr "Klaviatuurisätted"
 
@@ -1137,10 +1048,6 @@ msgstr "Luba alati"
 msgid "Grant this time only"
 msgstr "Luba ainult seekord"
 
-msgid "Reject"
-msgstr "Lükka tagasi"
-
-#. Translators: argument is the device short name
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Paardumise kinnitus seadmele %s"
@@ -1153,7 +1060,6 @@ msgstr "Seade '%s' tahab selle arvutiga paarduda"
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
 msgstr "Palun kontrolli, kas PIN-kood '%06d' kattub seadme parooliga."
 
-#. Translators: this is the verb, not the noun
 msgid "Matches"
 msgstr "Kattub"
 
@@ -1243,8 +1149,17 @@ msgstr "Automaatne juhtmeta ühendus"
 msgid "Enable networking"
 msgstr "Luba võrguühendused"
 
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgid "Wired"
+msgstr "Juhtmega"
+
+msgid "Wireless"
+msgstr "Juhtmeta"
+
+msgid "Mobile broadband"
+msgstr "Mobiiliühendus"
+
+msgid "VPN Connections"
+msgstr "VPN-ühendused"
 
 msgid "Network Settings"
 msgstr "Võrgusätted"
@@ -1348,9 +1263,6 @@ msgstr "Mikrofon"
 msgid "Log in as another user"
 msgstr "Logi sisse teise kasutajana"
 
-msgid "Unlock Window"
-msgstr "Võta aken lukust lahti"
-
 msgid "Available"
 msgstr "Saadaval"
 
@@ -1366,20 +1278,23 @@ msgstr "Eemal"
 msgid "Idle"
 msgstr "Jõude"
 
-msgid "Offline"
-msgstr "Ühendamata"
+msgid "Unavailable"
+msgstr "Pole saadaval"
 
 msgid "Notifications"
 msgstr "Märguanded"
 
-msgid "Settings"
-msgstr "Sätted"
+msgid "System Settings"
+msgstr "Süsteemi sätted"
 
 msgid "Switch User"
 msgstr "Vaheta kasutajat"
 
 msgid "Log Out"
-msgstr "Logi välja"
+msgstr "Väljalogimine"
+
+msgid "Lock"
+msgstr "Lukusta"
 
 msgid "Install Updates & Restart"
 msgstr "Paigalda uuendused ja taaskäivita"
@@ -1394,6 +1309,9 @@ msgstr ""
 "Märguanded on nüüd keelatud, sealhulgas vestlusteated. Sinu netiolekut "
 "muudeti, et teised teaksid, et sa ei pruugi nende teateid näha."
 
+msgid "Windows"
+msgstr "Aknad"
+
 msgid "Applications"
 msgstr "Rakendused"
 
@@ -1422,6 +1340,25 @@ msgstr "'%s' on valmis"
 msgid "Evolution Calendar"
 msgstr "Evolutioni kalender"
 
+#. translators:
+#. * The number of sound outputs on a particular device
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u väljund"
+msgstr[1] "%u väljundit"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u sisend"
+msgstr[1] "%u sisendit"
+
+msgid "System Sounds"
+msgstr "Süsteemi helid"
+
 msgid "Print version"
 msgstr "Printimise versioon"
 
@@ -1453,45 +1390,26 @@ msgstr "Vaikimisi"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Kasutaja katkestas autentimisdialoogi"
 
-#~ msgid "Subscription request"
-#~ msgstr "Tellimuse päring"
+#, fuzzy
+#~ msgid "Show all applications"
+#~ msgstr "Rakenduste kuvamine"
 
-#~ msgid "Connection error"
-#~ msgstr "Ühenduse viga"
+#, fuzzy
+#~ msgid "Open the application menu"
+#~ msgstr "Rakenduste menüü avamise kiirklahv"
 
-#~ msgid "<b>%H:%M</b> on Yesterday"
-#~ msgstr "Eile <b>%H:%M</b>"
+#, fuzzy
+#~ msgid "Keybinding to open the \"Show Applications\" view"
+#~ msgstr "Rakenduste menüü avamise kiirklahv"
 
-#~ msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
-#~ msgstr "<b>%H:%M</b>, <b>%A</b>, <b>%d. %B</b> %Y"
+#, fuzzy
+#~ msgid ""
+#~ "Keybinding to open the \"Show Applications\" view of the Activities "
+#~ "Overview."
+#~ msgstr "Kiirklahv  rakenduste menüü avamiseks."
 
-#~ msgid "Connection to %s failed"
-#~ msgstr "Ühendus %s nurjus"
-
-#~ msgid "Reconnect"
-#~ msgstr "Ühendu uuesti"
-
-#~ msgid "Wired"
-#~ msgstr "Juhtmega"
-
-#~ msgid "Wireless"
-#~ msgstr "Juhtmeta"
-
-#~ msgid "Mobile broadband"
-#~ msgstr "Mobiiliühendus"
-
-#~ msgid "%u Output"
-#~ msgid_plural "%u Outputs"
-#~ msgstr[0] "%u väljund"
-#~ msgstr[1] "%u väljundit"
-
-#~ msgid "%u Input"
-#~ msgid_plural "%u Inputs"
-#~ msgstr[0] "%u sisend"
-#~ msgstr[1] "%u sisendit"
-
-#~ msgid "System Sounds"
-#~ msgstr "Süsteemi helid"
+#~ msgid "Switch Session"
+#~ msgstr "Vaheta seanssi"
 
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "keelatud OpenSearch pakkujad"
@@ -1508,6 +1426,9 @@ msgstr "Kasutaja katkestas autentimisdialoogi"
 #~ msgid "If true, display date in the clock, in addition to time."
 #~ msgstr "Kui määratud, siis kuvatakse kellaaja kõrval ka kuupäeva."
 
+#~ msgid "Offline"
+#~ msgstr "Ühendamata"
+
 #~ msgid "CONTACTS"
 #~ msgstr "KONTAKTID"
 

po/gu.po

@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-18 04:20+0000\n"
-"PO-Revision-Date: 2012-09-18 16:59+0530\n"
+"POT-Creation-Date: 2012-11-04 19:00+0000\n"
+"PO-Revision-Date: 2012-11-05 12:23+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@@ -20,6 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: ../data/50-gnome-shell-screenshot.xml.in.h:1
+msgid "Screenshots"
+msgstr "સ્ક્રીનશોટ"
+
+#: ../data/50-gnome-shell-screenshot.xml.in.h:2
+msgid "Record a screencast"
+msgstr "સ્ક્રીનકાસ્ટ રેકોર્ડ કરો"
+
+#: ../data/50-gnome-shell-system.xml.in.h:1
+msgid "System"
+msgstr "સિસ્ટમ"
+
+#: ../data/50-gnome-shell-system.xml.in.h:2
+msgid "Show the message tray"
+msgstr "સંદેશો ટ્રેને બતાવો"
+
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME શેલ"
@@ -45,7 +61,7 @@ msgstr "Alt-F2 માંથી ડેવલપર અને ટેસ્ટર
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
-msgstr ""
+msgstr "Alt-F2 સંવાદની મદદથી આંતરિક ડિબગીંગ અને મોનિટરીંગ સાધનોને વાપરવા પરવાનગી આપે છે."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
@@ -58,10 +74,13 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
+"GNOME Shell ઍક્સટેન્શન પાસે uuid ગુણધર્મ છે; આ કી ઍક્સટેન્શનની યાદી કરે છે કે જેને લાવેલ "
+"હોવુ જોઇએ. કોઇપણ ઍક્સટેન્શન કે જેને આ યાદીમાં લાવવાની જરૂર છે. તમે પણ org.gnome.Shell પર "
+"EnableExtension અને DisableExtension DBus પદ્દતિઓ સાથે આ યાદીને કુશળતાપૂર્વક વાપરી શકો છો."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Whether to collect stats about applications usage"
-msgstr ""
+msgstr "શું કાર્યક્રમ વપરાશ વિશે આંકડા એકત્ર કરવા જોઇએ"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
@@ -70,6 +89,10 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
+"શેલ સામાન્ય રીતે મોટાભાગનાં એકને હાજર રાખવા માટે ક્રમમાં સક્રિય કાર્યક્રમોને મોનિટર કરવામાં "
+"આવે છે (દા.ત. લૉન્ચર). જ્યારે આ માહિતીને ખાનગી રાખવામાં આવશે, તમે ખાનગી કારણો માટે આને "
+"નિષ્ક્રિય કરવા માંગી શકો છો. મહેરબાની કરીને આવુ કરવાનું નોંધો તેથી પહેલેથી સંગ્રહેલ "
+"માહિતીને દૂર કરાતુ નથી."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -79,7 +102,7 @@ msgstr "પસંદીદા કાર્યક્રમો માટે ડે
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
-msgstr ""
+msgstr "કાર્યક્રમો આ ઓળખકર્તાઓ સાથે સંકળાયેલ છે તે પસંદીદા વિસ્તારમાં દેખાશે."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "History for command (Alt-F2) dialog"
@@ -94,75 +117,87 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
+"વપરાશકર્તા દ્દારા છેલ્લુ IM સુયોજનને સંગ્રહવા આંતરિક રીતે વાપરેલ છે. અહિંયા કિંમત "
+"TpConnectionPresenceType ઍન્યુમરેશનમાંથી છે."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
+"વપરાશકર્તા માટે છેલ્લી સત્રની હાજર પરિસ્થિતિને સંગ્રહવા આંતરિક રીતે વાપરેલ છે. કિંમત અહિંયા "
+"GsmPresenceStatus ઍન્યુમરેશનમાંથી છે."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "હંમેશા વપરાશકર્તા મેનુમાં 'બહાર નીકળો' મેનુવસ્તુને બતાવે છે."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"આ કી એકજ વપરાશકર્તામાં 'બહાર નીકળો' મેનુવસ્તુને આપમેળે છુપાવવા આ કીને ઓવરરાઇડ કરવામાં આવી "
+"છે."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "કૅલેન્ડરમાં અઠવાડિયા તારીખને બતાવો"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "જો true હોય તો, કૅલેન્ડરમાં ISO અઠવાડિયાની તારીખને દર્શાવો."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-#, fuzzy
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 #| msgid "Keybinding to open the application menu"
 msgid "Keybinding to toggle the visibility of the message tray"
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-#, fuzzy
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the visibility of the message tray."
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
-#, fuzzy
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the screen recorder"
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
+msgstr "સંદેશા ટ્રેની દૃશ્યતાને ટૉગલ કરવા માટે કીબાઇન્ડીંગ"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-#| msgid "Keybinding to open the application menu."
+msgid "Keybinding to toggle the visibility of the message tray."
+msgstr "સંદેશા ટ્રેની દૃશ્યતાને ટૉગલ કરવા માટે કીબાઇન્ડીંગ."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+msgid "Keybinding to toggle the screen recorder"
+msgstr "સ્ક્રીન રેકોર્ડરને ટૉગલ કરવા માટે કીબાઇન્ડીંગ"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "બિલ્ટઇન સ્ક્રીન રેકોર્ડરને શરૂ/બંધ કરવા માટે કfબાઇન્ડીંગ."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "ક્યુ કિબોર્ડ વાપરવુ છે"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "વાપરવા માટે કિબોર્ડનો પ્રકાર."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "રેકોર્ડીંગ સ્ક્રીનકાસ્ટ માટે વાપરેલ ફ્રેમરેટ."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
+"પરિણામી સ્ક્રીનકાસ્ટની framerate એ દરેક સેકંડે ફ્રેમમાં GNOME Shell નાં સ્ક્રીનકાસ્ટ "
+"રેકોર્ડર દ્દારા અહેવાલ થયેલ છે."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "સ્ક્રીનકાસ્ટને એનકોડ કરવા માટે વાપરેલ gstreamer પાઇપલાઇન"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -176,17 +211,28 @@ msgid ""
 "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."
 msgstr ""
+"રેકોર્ડીંગ ને એનકોડ કરવા માટે વાપરેલ GStreamer પાઇપલાઇનને સુયોજિત કરે છે. તે gst-launch "
+"માટે વાપરેલ બંધારણને અનુસરે છે. પાઇપલાઇન પાસે બિનજોડાયેલ સીંક પેડ હોય છે જ્યાં રેકોર્ડ થયેલ "
+"વિડિયો રેકોર્ડ થયેલ છે. સામાન્ય રીતે તેમની પાસે બિનજોડાયેલ સ્ત્રોત પેડ હશે; તે પેડમાંથી "
+"આઉટપુટ એ આઉટપુટ ફાઇલમાં લખાયેલ હશે. છતાંપણ પાઇપલાઇન પણ તેનાં પોતાના આઉટપુટની સંભાળ લઇ શકે "
+"છે - આ shout2send  મારફતે અથવા તેનાં જેવા મારફતે icecast સર્વરમાં આઉટપુટને મોકલવા વાપરી "
+"શકાય છે. જ્યારે ખાલી ફાઇલને સુયોજિત અથવા અસુયોજિત કરો, મૂળભૂત પાઇપલાઇન વાપરેલ હે. આ હાલમાં "
+"'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
+"threads=%T ! queue ! webmmux' છે અને VP8 કોડેકની મદદતી WEBM માં રેકોર્ડ થાય છે. %T એ સિસ્ટમ "
+"પર ઓપ્ટીમલ થ્રેડ ગણતરી પર ધારવા માટે પ્લેસહોલ્ડરને વાપરેલ છે."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "સ્ક્રીનકાસ્ટને સંગ્રહ કરવા માટે વાપરેલ ફાઇલ ઍક્સટેન્શન"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr ""
+"રેકોર્ડ થયેલ સ્ક્રીનકાસ્ટ માટે ફાઇલનામ વર્તમાન તારીખ પર આધારિત અનન્ય ફાઇલનામ હશે, અને આ "
+"ઍક્સટેન્શનને વાપરો. તેને બદલેલ હોવુ જોઇએ જ્યારે વિવિધ પાત્ર બંધારણમાં રેકોર્ડ કરી રહ્યા છે."
 
 #: ../js/extensionPrefs/main.js:124
 #, c-format
@@ -201,11 +247,11 @@ msgstr "ઍક્સટેન્શન"
 msgid "Select an extension to configure using the combobox above."
 msgstr "ઉપર કોમ્બોબોક્સની મદદથી રૂપરેખાંકિત કરવા માટે ઍક્સટેન્શનને પસંદ કરો."
 
-#: ../js/gdm/loginDialog.js:526
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "સત્ર..."
 
-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "પ્રવેશો"
@@ -213,47 +259,56 @@ msgstr "પ્રવેશો"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "શું યાદી થયેલ નથી?"
 
-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:137
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "રદ કરો"
 
-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "પ્રવેશો"
 
-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "પ્રવેશ વિન્ડો"
 
-#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:657 ../js/ui/userMenu.js:661
-#: ../js/ui/userMenu.js:772
+#. Translators: accessible name of the power menu in the login screen
+#: ../js/gdm/powerMenu.js:35
+msgid "Power"
+msgstr "પાવર"
+
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "અટકાવો"
 
-#: ../js/gdm/powerMenu.js:93
+#: ../js/gdm/powerMenu.js:94
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"
 
-#: ../js/gdm/powerMenu.js:98 ../js/ui/userMenu.js:659 ../js/ui/userMenu.js:661
-#: ../js/ui/userMenu.js:771
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "પાવર બંધ"
 
+#: ../js/gdm/util.js:148
+msgid "Authentication error"
+msgstr "સત્તાધિકરણ ભૂલ"
+
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:247
+#: ../js/gdm/util.js:265
 msgid "(or swipe finger)"
 msgstr "(અથવા સ્વાઇપ આંગળી)"
 
-#: ../js/gdm/util.js:272
+#: ../js/gdm/util.js:290
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(દા.ત., વપરાશકર્તા અથવા %s)"
@@ -290,7 +345,7 @@ msgstr "SETTINGS"
 msgid "New Window"
 msgstr "નવી વિન્ડો"
 
-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "પસંદીદાઓ માંથી દૂર કરો"
 
@@ -454,16 +509,16 @@ msgstr "આ અઠવાડિયે"
 msgid "Next week"
 msgstr "આગળનું અઠવાડિયું"
 
-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "દૂર કરી શકાય તેવા ઉપકરણો"
 
-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "%s સાથે ખોલો"
 
-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "રદ કરો"
 
@@ -618,35 +673,35 @@ msgstr "મૂંગુ"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "<b>%A</b> પર <b>%X</b> અહિંયા મોકલેલ છે"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "<b>%A</b> પર મોકલેલ છે, <b>%B %d</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "<b>%A</b> પર મોકલેલ છે, <b>%B %d</b>, %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s એ હવે %s તરીકે જાણીતુ છે"
 
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "%s માં આમંત્રણ"
@@ -654,42 +709,42 @@ msgstr "%s માં આમંત્રણ"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s એ તમને %s માં જોડાવા માટે આમંત્રણ આપી રહ્યા છે"
 
-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "ના પાડવી"
 
-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "સ્વીકારો"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "%s માંથી વિડીયો કોલ"
 
 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "%s માંથી કોલ"
 
-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "રદ કરો"
 
 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "જવાબ"
 
@@ -698,136 +753,137 @@ msgstr "જવાબ"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s એ %s માં મોકલી રહ્યા છે"
 
 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ને જોવા માટે પરવાનગી આપવાનું ગમે થે જ્યારે તમે ઓનલાઇન હોય"
 
-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "નેટવર્ક ભૂલ"
 
-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "સત્તાધિકરણ નિષ્ક્રિય"
 
-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "એનક્રિપ્શન ભૂલ"
 
-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "પ્રમાણપત્ર પૂરુ પાડેલ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "પ્રમાણપત્ર વિશ્ર્વાસપાત્ર નથી"
 
-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "પ્રમાણપત્ર નિવૃત્ત થયેલ છે"
 
-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "પ્રમાણપત્ર સક્રિય થયેલ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "પ્રમાણપત્ર યજમાનનામ બંધબેસતુ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "પ્રમાણપજ્ઞ ફિંગરપ્રિન્ટ બંધબેસતુ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "જાતે હસ્તાક્ષર થયેલ પ્રમાણપત્ર"
 
-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "સ્થિતિ ઓફલાઇન તરીકે સુયોજિત છે"
 
-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "એનક્રિપ્શન ઉપલબ્ધ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "પ્રમાણપત્ર અમાન્ય છે"
 
-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "જોડાણને નામંજૂર કરી દેવામાં આવ્યુ છે"
 
-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "જોડાણ સ્થાપિત કરી શકાતુ નથી"
 
-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "જોડાણ ખોવાઈ ગયેલ છે"
 
-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "આ ખાતુ પહેલેથી જ સર્વર સાથે જોડાયેલ છે"
 
-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "સરખા સ્ત્રોતની મદદથી જોડાણને નવાં જોડાણ દ્દારા બદલી દેવામાં આવ્યુ છે"
 
-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "ખાતુ પહેલેથી સર્વર પર અસ્તિત્વ ધરાવે છે"
 
-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "સર્વર એ જોડાણને સંચાલિત કરવા માટે હાલમાં વ્યસ્ત છે"
 
-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "પ્રમાણપત્રને રદ કરી દેવામાં આવ્યુ છે"
 
-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
+msgstr "પ્રમાણપત્ર અસુરક્ષિત સાઇફર અલ્ગોરિધમને વાપરે છે અથવા ક્રિપ્ટોગ્રાફિકલી નબળુ છે"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"સર્વર પ્રમાણપત્રની લંબાઇ, સર્વર પ્રમાણપત્ર કતારની ઊંચાઇ, ક્રિપ્ટોગ્રાફી લાઇબ્રેરી દ્દારા "
+"બનાવેલ મર્યાદાને વધારે છે"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "આંતરિક ભૂલ"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "%s માટે જોડાણ નિષ્ફળ"
 
-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "પુન:જોડાવો"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "ખાતામાં ફેરફાર કરો"
 
-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "અજ્ઞાત કારણ"
 
-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
-#| msgid "Applications"
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "કાર્યક્રમો બતાવો"
 
@@ -835,14 +891,14 @@ msgstr "કાર્યક્રમો બતાવો"
 msgid "Date and Time Settings"
 msgstr "તારીખ અને સમય સુયોજનો"
 
-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "કૅલેન્ડરને ખોલો"
 
 #. 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").
 #.
-#: ../js/ui/dateMenu.js:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A %B %e, %Y"
 
@@ -859,8 +915,7 @@ msgstr "બહાર નીકળો"
 
 #: ../js/ui/endSessionDialog.js:63
 msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
-"આ કાર્યક્રમોને બહાર નીકળવા માટે બહાર નીકળો પર ક્લિક કરો અને સિસ્ટમમાંથી બહાર નીકળો."
+msgstr "આ કાર્યક્રમોને બહાર નીકળવા માટે બહાર નીકળો પર ક્લિક કરો અને સિસ્ટમમાંથી બહાર નીકળો."
 
 #: ../js/ui/endSessionDialog.js:65
 #, c-format
@@ -892,8 +947,7 @@ msgstr "પાવર બંધ"
 
 #: ../js/ui/endSessionDialog.js:82
 msgid "Click Power Off to quit these applications and power off the system."
-msgstr ""
-"આ કાર્યક્રમોને બહાર નીકાળવા માટે પાવર બંધ કરો પર ક્લિક કરો અને સિસ્ટમનો પાવર બંધ કરો"
+msgstr "આ કાર્યક્રમોને બહાર નીકાળવા માટે પાવર બંધ કરો પર ક્લિક કરો અને સિસ્ટમનો પાવર બંધ કરો"
 
 #: ../js/ui/endSessionDialog.js:84
 #, c-format
@@ -923,8 +977,7 @@ msgstr "પુન:શરૂ કરો"
 
 #: ../js/ui/endSessionDialog.js:99
 msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-"આ કાર્યક્રમોમાંથી બહાર નીકળવા માટે પુન:શરૂ કરો પર ક્લિક કરો અને સિસ્ટમને પુન:શરૂ કરો."
+msgstr "આ કાર્યક્રમોમાંથી બહાર નીકળવા માટે પુન:શરૂ કરો પર ક્લિક કરો અને સિસ્ટમને પુન:શરૂ કરો."
 
 #: ../js/ui/endSessionDialog.js:101
 #, c-format
@@ -946,11 +999,11 @@ msgstr "સ્થાપિત કરો"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "extensions.gnome.org માંથી '%s' ને સ્થાપિત અને ડાઉનલોડ કરો?"
 
-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "ટ્રે"
 
-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:146
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "કિબોર્ડ"
@@ -1003,23 +1056,23 @@ msgstr "સ્ત્રોત દર્શાવો"
 msgid "Web Page"
 msgstr "વેબ પાનું"
 
-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "ખોલો"
 
-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "દૂર કરો"
 
-#: ../js/ui/messageTray.js:2041
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "સંદેશો ટ્રે"
 
-#: ../js/ui/messageTray.js:2483
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "સિસ્ટમ જાણકારી"
 
-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
@@ -1075,22 +1128,19 @@ msgstr "મહેરબાની કરીને આદેશને દાખલ
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:78
-#| msgctxt "calendar heading"
-#| msgid "%A, %B %d"
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d નવો સંદેશો"
 msgstr[1] "%d નવા સંદેશા"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
-#| msgid "Notifications"
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d નવી સૂચના"
@@ -1101,7 +1151,6 @@ msgid "Searching..."
 msgstr "શોધી રહ્યા છે..."
 
 #: ../js/ui/searchDisplay.js:323
-#| msgid "No matching results."
 msgid "No results."
 msgstr "પરિણામો નથી."
 
@@ -1122,16 +1171,14 @@ msgid "Hide Text"
 msgstr "લખાણ છુપાડો"
 
 #: ../js/ui/shellMountOperation.js:368
-#| msgid "Password:"
 msgid "Password"
 msgstr "પાસવર્ડ"
 
 #: ../js/ui/shellMountOperation.js:389
-#| msgid "Remember Passphrase"
 msgid "Remember Password"
 msgstr "પાસવર્ડને યાદ રાખો"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:140
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "તાળું ખોલો"
 
@@ -1249,7 +1296,7 @@ msgstr "કીબોર્ડ સુયોજનો"
 msgid "Mouse Settings"
 msgstr "માઉસ સુયોજનો"
 
-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "સાઇન્ડ સુયોજનો"
 
@@ -1282,10 +1329,9 @@ msgid "Device %s wants to pair with this computer"
 msgstr "ઉપકરણ %s આ કમ્પ્યૂટર સાથે જોડી કરવા માંગે છે"
 
 #: ../js/ui/status/bluetooth.js:379
-#, fuzzy, c-format
-#| msgid "Please confirm whether the PIN '%s' matches the one on the device."
+#, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "મહેરબાની કરીને ખાતરી કરો કે શું PIN '%s' એ ઉપકરણ પર એક સાથે બંધબેસે છે."
+msgstr "મહેરબાની કરીને ખાતરી કરો કે શું PIN '%06d'  એ ઉપકરણ પર એક સાથે બંધબેસે છે."
 
 #: ../js/ui/status/bluetooth.js:381
 msgid "Matches"
@@ -1308,11 +1354,11 @@ msgstr "મહેરબાની કરીને ઉપકરણ પર દર
 msgid "OK"
 msgstr "બરાબર"
 
-#: ../js/ui/status/keyboard.js:170
+#: ../js/ui/status/keyboard.js:228
 msgid "Show Keyboard Layout"
 msgstr "કીબોર્ડ લેઆઉટને બતાવો"
 
-#: ../js/ui/status/keyboard.js:175
+#: ../js/ui/status/keyboard.js:233
 msgid "Region and Language Settings"
 msgstr "વિસ્તાર અને ભાષા સુયોજનો"
 
@@ -1535,7 +1581,7 @@ msgid "Unknown"
 msgstr "અજ્ઞાત"
 
 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "વોલ્યુમ"
 
@@ -1543,72 +1589,69 @@ msgstr "વોલ્યુમ"
 msgid "Microphone"
 msgstr "માઇક્રોફોન"
 
-#: ../js/ui/unlockDialog.js:147
-#| msgid "Login as another user"
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "બીજા વપરાશકર્તા તરીકે પ્રવેશો"
 
-#: ../js/ui/userMenu.js:174
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "ઉપલબ્ધ"
 
-#: ../js/ui/userMenu.js:177
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "અદૃશ્ય"
 
-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "દૂર"
 
-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "નિષ્ક્રિય"
 
-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "બિનઉપલબ્ધ"
 
-#: ../js/ui/userMenu.js:612 ../js/ui/userMenu.js:753
-msgid "Switch User"
-msgstr "વપરાશકર્તાને બદલો"
-
-#: ../js/ui/userMenu.js:613
-msgid "Switch Session"
-msgstr "સત્ર બદલો"
-
-#: ../js/ui/userMenu.js:737
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "સૂચનાઓ"
 
-#: ../js/ui/userMenu.js:745
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "સિસ્ટમ સુયોજનો"
 
-#: ../js/ui/userMenu.js:758
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "વપરાશકર્તાને બદલો"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "બહાર નીકળો"
 
-#: ../js/ui/userMenu.js:763
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "તાળુ"
 
-#: ../js/ui/userMenu.js:778
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "સુધારા સ્થાપિત કરો અને પુન:શરૂ કરો"
 
-#: ../js/ui/userMenu.js:796
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "તમારી વાર્તાલાપ પરિસ્થિતિ વ્યસ્ત તરીકે સુયોજિત હશે"
 
-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:804
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
 msgstr ""
+"સૂચનાઓ હવે નિષ્ક્રિય થયેલ છે, વાર્તાલાપ સંદેશાને સમાવી રહ્યા છે, બીજાને જણાવવા માટે તમારી "
+"ઓનલાઇન સ્થિતિને ગોઠવી દેવામાં આવી છે કે જે તમે તેનાં સંદેશાને જોઇ શકશો નહિં."
 
 #: ../js/ui/viewSelector.js:85
 msgid "Windows"
@@ -1622,7 +1665,7 @@ msgstr "કાર્યક્રમો"
 msgid "Search"
 msgstr "શોધો"
 
-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1631,12 +1674,12 @@ msgstr ""
 "માફ કરો, આજે તમારા માટે શાણપણ નથી:\n"
 "%s"
 
-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
-msgstr ""
+msgstr "%s એ એવી કિંમત છે જે Oracle કહે છે"
 
-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "તમારા મનગમતા ઇસ્ટર ઇંડા"
 
@@ -1671,23 +1714,23 @@ msgstr[1] "%u ઇનપુટો"
 msgid "System Sounds"
 msgstr "સિસ્ટમ અવાજો"
 
-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "ા"
 
-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "લૉગિન સ્ક્રીન માટે GDM દ્દારા વાપરેલ સ્થિતિ"
 
-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "ખાસ સ્થિતિને વાપરો, દા.ત. પ્રવેશ સ્ક્રીન માટે \"gdm\""
 
-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "શક્ય સ્થિતિઓની યાદી કરો"
 
-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s' ને શરૂ કરવામાં નિષ્ફળતા"
@@ -1710,7 +1753,10 @@ msgstr "મૂળભૂત"
 
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
-msgstr ""
+msgstr "સત્તાધિકરણ વપરાશકર્તા દ્દારા અસ્વીકાર થયેલ છે"
+
+#~ msgid "Switch Session"
+#~ msgstr "સત્ર બદલો"
 
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "નિષ્ક્રિય થયેલ OpenSearch પ્રબંધક"
@@ -1733,9 +1779,6 @@ msgstr ""
 #~ msgid "Home"
 #~ msgstr "ઘર"
 
-#~ msgid "File System"
-#~ msgstr "ફાઇલ સિસ્ટમ"
-
 #~ msgid "%1$s: %2$s"
 #~ msgstr "%1$s: %2$s"
 

po/id.po

@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 07:11+0700\n"
+"POT-Creation-Date: 2012-09-25 00:06+0000\n"
+"PO-Revision-Date: 2012-09-25 09:53+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.3\n"
 
 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
 msgid "Screenshots"
@@ -38,14 +38,6 @@ msgstr "Sistem"
 msgid "Show the message tray"
 msgstr "Tampilkan baki pesan"
 
-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Tampilkan semua aplikasi"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Buka menu aplikasi"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@@ -163,45 +155,34 @@ msgid "Keybinding to open the application menu."
 msgstr "Kombinasi tombol untuk membuka menu aplikasi."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Kombinasi tombol untuk membuka tilikan \"Tampilkan Aplikasi\""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Kombinasi tombol untuk membuka tilikan Ringkasan Aktivitas \"Tampilkan "
-"Aplikasi\"."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Kombinasi tombol untuk kenampakan baki pesan"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Kombinasi tombol untuk kenampakan baki pesan."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Kombinasi tombol untuk perekaman layar"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Kombinasi tombol mulai/menghentikan perekam layar bawaan."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Which keyboard to use"
 msgstr "Papan tik mana yang akan dipakai"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "The type of keyboard to use."
 msgstr "Jenis papan tik yang akan dipakai."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Framerate used for recording screencasts."
 msgstr "Laju gambar untuk menyimpan tangkapan layar."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -209,11 +190,11 @@ msgstr ""
 "Laju frame dari hasil screencast yang direkam oleh perekam screencast GNOME "
 "Shell dalam frame per detik."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Jalur pipa gstreamer yang dipakai untuk mengode screencast"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -239,11 +220,11 @@ msgstr ""
 "dan merekam ke WEBM memakai kodek VP8. %T digunakan sebagai pewakil untuk "
 "perkiraan jumlah thread optimal pada sistem."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "File extension used for storing the screencast"
 msgstr "Ekstensi berkas untuk menyimpan tangkapan layar"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -266,11 +247,11 @@ msgstr "Ekstensi"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Pilih ekstensi yang ingin dikonfigurasi pada kotak di atas."
 
-#: ../js/gdm/loginDialog.js:529
+#: ../js/gdm/loginDialog.js:527
 msgid "Session..."
 msgstr "Sesi..."
 
-#: ../js/gdm/loginDialog.js:677
+#: ../js/gdm/loginDialog.js:675
 msgctxt "title"
 msgid "Sign In"
 msgstr "Masuk"
@@ -278,33 +259,34 @@ msgstr "Masuk"
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:736
+#: ../js/gdm/loginDialog.js:742
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"
 
-#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../js/gdm/loginDialog.js:894
+#: ../js/gdm/loginDialog.js:900
 msgctxt "button"
 msgid "Sign In"
 msgstr "Masuk"
 
-#: ../js/gdm/loginDialog.js:1215
+#: ../js/gdm/loginDialog.js:1239
 msgid "Login Window"
 msgstr "Jendela Log Masuk"
 
 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
+#| msgid "Power Off"
 msgid "Power"
 msgstr "Daya"
 
-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
+#: ../js/ui/userMenu.js:778
 msgid "Suspend"
 msgstr "Suspensi"
 
@@ -312,8 +294,8 @@ msgstr "Suspensi"
 msgid "Restart"
 msgstr "Nyalakan Ulang"
 
-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
+#: ../js/ui/userMenu.js:777
 msgid "Power Off"
 msgstr "Matikan"
 
@@ -364,7 +346,7 @@ msgstr "PENGATURAN"
 msgid "New Window"
 msgstr "Jendela Baru"
 
-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
 msgid "Remove from Favorites"
 msgstr "Hapus dari Favorit"
 
@@ -528,16 +510,16 @@ msgstr "Minggu ini"
 msgid "Next week"
 msgstr "Minggu depan"
 
-#: ../js/ui/components/autorunManager.js:297
+#: ../js/ui/components/autorunManager.js:278
 msgid "Removable Devices"
 msgstr "Perangkat Yang Dapat Dicabut"
 
-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:575
 #, c-format
 msgid "Open with %s"
 msgstr "Buka dengan %s"
 
-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:601
 msgid "Eject"
 msgstr "Keluarkan"
 
@@ -909,7 +891,7 @@ msgstr "Sunting Akun"
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"
 
-#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
+#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
 msgid "Show Applications"
 msgstr "Tampilkan Aplikasi"
 
@@ -917,14 +899,14 @@ msgstr "Tampilkan Aplikasi"
 msgid "Date and Time Settings"
 msgstr "Pengaturan Waktu dan Tanggal"
 
-#: ../js/ui/dateMenu.js:111
+#: ../js/ui/dateMenu.js:109
 msgid "Open Calendar"
 msgstr "Buka Kalender"
 
 #. 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").
 #.
-#: ../js/ui/dateMenu.js:201
+#: ../js/ui/dateMenu.js:175
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
@@ -1023,11 +1005,11 @@ msgstr "Pasang"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Unduh dan pasang '%s' dari extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:337
+#: ../js/ui/keyboard.js:327
 msgid "tray"
 msgstr "baki"
 
-#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Papan Ketik"
@@ -1080,19 +1062,19 @@ msgstr "Tilik Sumber"
 msgid "Web Page"
 msgstr "Halaman Web"
 
-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1080
 msgid "Open"
 msgstr "Buka"
 
-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1087
 msgid "Remove"
 msgstr "Hapus"
 
-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:2055
 msgid "Message Tray"
 msgstr "Baki Pesan"
 
-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2511
 msgid "System Information"
 msgstr "Informasi Sistem"
 
@@ -1157,13 +1139,13 @@ msgstr "Ketikkan perintah:"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1201,7 +1183,7 @@ msgstr "Sandi"
 msgid "Remember Password"
 msgstr "Ingat Sandi"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
 msgid "Unlock"
 msgstr "Buka Kunci"
 
@@ -1319,7 +1301,7 @@ msgstr "Pengaturan Papan Ketik"
 msgid "Mouse Settings"
 msgstr "Pengaturan Tetikus"
 
-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
 msgid "Sound Settings"
 msgstr "Pengaturan Suara"
 
@@ -1600,7 +1582,7 @@ msgid "Unknown"
 msgstr "Tak Dikenal"
 
 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
 msgid "Volume"
 msgstr "Volume"
 
@@ -1608,7 +1590,7 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../js/ui/unlockDialog.js:177
+#: ../js/ui/unlockDialog.js:176
 msgid "Log in as another user"
 msgstr "Masuk sebagai pengguna lain"
 
@@ -1636,35 +1618,39 @@ msgstr "Menganggur"
 msgid "Unavailable"
 msgstr "Tak tersedia"
 
-#: ../js/ui/userMenu.js:740
-msgid "Notifications"
-msgstr "Pemberitahuan"
-
-#: ../js/ui/userMenu.js:748
-msgid "System Settings"
-msgstr "Pengaturan Sistem"
-
-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
 msgid "Switch User"
 msgstr "Ganti Pengguna"
 
-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:619
+msgid "Switch Session"
+msgstr "Pindah Sesi"
+
+#: ../js/ui/userMenu.js:743
+msgid "Notifications"
+msgstr "Pemberitahuan"
+
+#: ../js/ui/userMenu.js:751
+msgid "System Settings"
+msgstr "Pengaturan Sistem"
+
+#: ../js/ui/userMenu.js:764
 msgid "Log Out"
 msgstr "Keluar"
 
-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:769
 msgid "Lock"
 msgstr "Kunci"
 
-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:784
 msgid "Install Updates & Restart"
 msgstr "Pasang Pemutakhiran & Jalankan Ulang"
 
-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:802
 msgid "Your chat status will be set to busy"
 msgstr "Status obrolan Anda akan ditata ke sibuk"
 
-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:803
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1673,19 +1659,19 @@ msgstr ""
 "telah disesuaikan untuk memberitahu pihak lain bahwa Anda mungkin tak "
 "melihat pesan mereka."
 
-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Jendela"
 
-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Aplikasi"
 
-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Cari"
 
-#: ../js/ui/wanda.js:117
+#: ../js/ui/wanda.js:119
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1694,12 +1680,12 @@ msgstr ""
 "Maaf, tidak ada kata-kata bijak bagi Anda hari ini:\n"
 "%s"
 
-#: ../js/ui/wanda.js:121
+#: ../js/ui/wanda.js:123
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s sang Peramal berkata"
 
-#: ../js/ui/wanda.js:162
+#: ../js/ui/wanda.js:164
 msgid "Your favorite Easter Egg"
 msgstr "Easter Egg kesukaan Anda"
 
@@ -1732,19 +1718,19 @@ msgstr[0] "%u Masukan"
 msgid "System Sounds"
 msgstr "Suara Sistem"
 
-#: ../src/main.c:332
+#: ../src/main.c:330
 msgid "Print version"
 msgstr "Versi Cetak"
 
-#: ../src/main.c:338
+#: ../src/main.c:336
 msgid "Mode used by GDM for login screen"
 msgstr "Mode yang dipakai oleh layar log masuk GDM"
 
-#: ../src/main.c:344
+#: ../src/main.c:342
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Menggunakan mode tertentu, mis. \"gdm\" untuk layar masuk"
 
-#: ../src/main.c:350
+#: ../src/main.c:348
 msgid "List possible modes"
 msgstr "Menampilkan mode yang mungkin"