Bump version to 3.21.92

Update NEWS.
Add more options to XGETTEXT_OPTIONS in po/Makevars
2016-09-13 00:16:11 +02:00 · 2016-09-12 19:43:44 +02:00 · 2016-09-11 21:20:39 +00:00 · 2016-09-11 17:52:46 +00:00 · 2016-09-11 19:20:00 +02:00 · 2016-09-11 19:17:36 +02:00
89 changed files with 15638 additions and 14066 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,7 +16,6 @@ config.log
 config.status
 config
 configure
-data/50-gnome-shell-*.xml
 data/org.gnome.Shell.desktop
 data/org.gnome.Shell.desktop.in
 data/gnome-shell-extension-prefs.desktop
@ -26,8 +25,6 @@ data/gschemas.compiled
 data/perf-background.xml
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
-data/org.gnome.shell.evolution.calendar.gschema.xml
-data/org.gnome.shell.evolution.calendar.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
 data/theme/.sass-cache
@ -74,7 +71,6 @@ src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
 src/calendar-server/evolution-calendar.desktop
-src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
--- a/71
+++ b/71
@ -1,3 +1,74 @@
+3.21.92
+=======
+* Adjust screen capture to work with multiple stage views [Jonas; #770128]
+* Improve handling of cycle shortcuts [Florian; #771063]
+* Fix windows not getting undimmed in some cases [Rui; #770163, #752524]
+* Disable extension version check by default [Florian; #770887]
+* Misc. bug fixes [Rui, Florian, Michael; #770382, #770888, #770328]
+
+Contributors:
+  Jonas Ådahl, Michael Catanzaro, Fran Dieguez, Olivier Fourdan, Rui Matos,
+  Florian Müllner
+
+Translations:
+  Changwoo Ryu [ko], Baurzhan Muftakhidinov [kk], Aurimas Černius [lt],
+  Muhammet Kara [tr], Trần Ngọc Quân [vi], A S Alam [pa], Yosef Or Boczko [he],
+  Anders Jonsson [sv], Tiago Santos [pt], Hannie Dumoleyn [nl],
+  Rūdolfs Mazurs [lv], Claude Paroz [fr], Arash Mousavi [fa],
+  Fran Dieguez [gl], Stas Solovey [ru], Tom Tryfonidis [el]
+
+3.21.91
+=======
+Translations:
+  Mario Blättermann [de], Jiri Grönroos [fi], Dušan Kazik [sk],
+  Andika Triwidada [id], Daniel Mustieles [es], Fabio Tomat [fur],
+  Enrico Nicoletto [pt_BR], Matej Urbančič [sl], Мирослав Николић [sr, sr@latin]
+
+3.21.90.1
+=========
+Contributors:
+  Piotr Drąg
+
+Translations:
+  Marek Černocký [cs], Balázs Úr [hu]
+
+3.21.90
+=======
+* Improve on-screen keyboard on wayland [Carlos; #765009]
+* Misc. bug fixes [Florian; #769156, #769216, #769074]
+
+Contributors:
+  Carlos Garnacho, Florian Müllner
+
+Translations:
+  Fabio Tomat [fur], Tiago Santos [pt], Daniel Mustieles [es],
+  Bernd Homuth [de], Aurimas Černius [lt], Balázs Úr [hu],
+  Yosef Or Boczko [he], Jiri Grönroos [fi], Marek Cernocky [cs],
+  Muhammet Kara [tr], Enrico Nicoletto [pt_BR], Andika Triwidada [id]
+
+3.21.4
+======
+* overview: Fix switching workspaces when scrolling on non-primary monitors
+  [Florian; #766883, #768316]
+* Fix crash when using screen recorder under wayland [Rui; #767001]
+* Update theme on video memory purge errors [Rui; #739178]
+* Free old backgrounds immediately [Hyungwon; #766353]
+* Add support for system upgrades to end session dialog [Kalev; #763611]
+* Fix maximized windows flickering to the wrong size on restart [Owen; #761566]
+* Hide ignored events in calendar as well [Florian; #768538]
+* calendar: Only hide dismissed occurrence of recurring event [Florian; #748226]
+* Provide org.freedesktop.impl.portal.access implementation [Florian; #768669]
+* Misc. bug fixes and cleanups [Rui, Florian, Marinus, Jonas; #767954, #768317,
+  #746867, #762206, #768956, #768979]
+
+Contributors:
+  Jonas Ådahl, Piotr Drąg, Hyungwon Hwang, Kalev Lember, Rui Matos,
+  Florian Müllner, Marinus Schraal, Owen W. Taylor
+
+Translations:
+  Andika Triwidada [id], Daniel Mustieles [es], Bruce Cowan [en_GB],
+  Dušan Kazik [sk], Piotr Drąg [pl], Chao-Hsiung Liao [zh_HK]
+
 3.21.3
 ======
 * Do not disable suspend action when locked [Florian; #725960]
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.21.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.21.92],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])

 AC_CONFIG_HEADERS([config.h])
@ -24,13 +24,14 @@ LT_PREREQ([2.2.6])
 LT_INIT([disable-static])

 # i18n
-IT_PROG_INTLTOOL([0.40])
-
 GETTEXT_PACKAGE=gnome-shell
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                   [The prefix for our gettext translation domains.])

+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT([external])
+
 PKG_PROG_PKG_CONFIG([0.22])

 AC_PATH_PROG([XSLTPROC], [xsltproc])
@ -75,9 +76,9 @@ AS_IF([test x$enable_systemd != xno], [
 AC_MSG_RESULT($enable_systemd)

 CLUTTER_MIN_VERSION=1.21.5
-GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
+GOBJECT_INTROSPECTION_MIN_VERSION=1.49.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.21.3
+MUTTER_MIN_VERSION=3.21.92
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
@ -119,7 +120,7 @@ PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 PKG_CHECK_MODULES(TRAY, mutter-clutter-1.0 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.21.2)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.21.3)

 AC_ARG_ENABLE(browser-plugin,
              [AS_HELP_STRING([--enable-browser-plugin],
@ -254,7 +255,6 @@ AC_CONFIG_FILES([
  docs/reference/st/Makefile
  docs/reference/st/st-docs.sgml
  js/Makefile
-  src/calendar-server/evolution-calendar.desktop.in
  src/Makefile
  src/gvc/Makefile
  browser-plugin/Makefile
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.shell.keybindings"
                group="system"
-                _name="System"
+                name="System"
                wm_name="GNOME Shell"
                package="gnome-shell">

 	<KeyListEntry name="toggle-message-tray"
-                      _description="Show the notification list"/>
+                      description="Show the notification list"/>

 	<KeyListEntry name="focus-active-notification"
-                      _description="Focus the active notification"/>
+                      description="Focus the active notification"/>

 	<KeyListEntry name="toggle-overview"
-                      _description="Show the overview"/>
+                      description="Show the overview"/>

 	<KeyListEntry name="toggle-application-view"
-                      _description="Show all applications"/>
+                      description="Show all applications"/>

 	<KeyListEntry name="open-application-menu"
-                      _description="Open the application menu"/>
+                      description="Open the application menu"/>

 </KeyListEntries>

--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -7,12 +7,16 @@ desktop_DATA = org.gnome.Shell.desktop gnome-shell-extension-prefs.desktop
 if HAVE_NETWORKMANAGER
 desktop_DATA += org.gnome.Shell.PortalHelper.desktop

+portaldir = $(datadir)/xdg-desktop-portal/portals
+portal_DATA = gnome-shell.portal
+
 servicedir = $(datadir)/dbus-1/services
 service_DATA = org.gnome.Shell.PortalHelper.service

 CLEANFILES += \
-	org.gnome.Shell.PortalHelper.service \
-	org.gnome.Shell.PortalHelper.desktop \
+	org.gnome.Shell.PortalHelper.service 	\
+	org.gnome.Shell.PortalHelper.desktop 	\
+	org.gnome.Shell.PortalHelper.desktop.in \
 	$(NULL)

 endif
@ -28,7 +32,9 @@ endif
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@

-@INTLTOOL_DESKTOP_RULE@
+%.desktop:%.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $(builddir)/$< \
+	                      -d $(top_srcdir)/po -o $@

 introspectiondir = $(datadir)/dbus-1/interfaces
 introspection_DATA =				\
@ -80,14 +86,11 @@ perf-background.xml: perf-background.xml.in
 	    $< > $@ || rm $@

 keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
-keys_in_files = 50-gnome-shell-system.xml.in
-keys_DATA = $(keys_in_files:.xml.in=.xml)
+keys_DATA = 50-gnome-shell-system.xml

 gsettings_SCHEMAS = org.gnome.shell.gschema.xml

-@INTLTOOL_XML_NOMERGE_RULE@
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
+%.gschema.xml: %.gschema.xml.in Makefile
 	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
 	$< > $@ || rm $@

@ -106,15 +109,16 @@ convert_DATA = gnome-shell-overrides.convert
 EXTRA_DIST =						\
 	org.gnome.Shell.desktop.in.in			\
 	gnome-shell-extension-prefs.desktop.in.in	\
+	$(portal_DATA)					\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
-	$(keys_in_files)				\
+	$(keys_DATA)					\
 	$(dist_theme_files)				\
 	perf-background.xml.in				\
-	org.gnome.Shell.PortalHelper.desktop.in		\
+	org.gnome.Shell.PortalHelper.desktop.in.in	\
 	org.gnome.Shell.PortalHelper.service.in		\
-	org.gnome.shell.gschema.xml.in.in		\
+	org.gnome.shell.gschema.xml.in			\
 	gnome-shell-theme.gresource.xml 		\
 	$(resource_files)				\
 	$(NULL)
@ -123,11 +127,9 @@ CLEANFILES +=						\
 	org.gnome.Shell.desktop.in			\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
-	$(keys_DATA)					\
 	$(gsettings_SCHEMAS)				\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in			\
 	gnome-shell-theme.gresource			\
 	$(NULL)
--- a/data/gnome-shell-extension-prefs.desktop.in.in
+++ b/data/gnome-shell-extension-prefs.desktop.in.in
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=GNOME Shell Extension Preferences
-_Comment=Configure GNOME Shell Extensions
+Name=GNOME Shell Extension Preferences
+Comment=Configure GNOME Shell Extensions
 Exec=@bindir@/gnome-shell-extension-prefs %u
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
--- a/data/gnome-shell.portal
+++ b/data/gnome-shell.portal
@ -0,0 +1,4 @@
+[portal]
+DBusName=org.freedesktop.impl.portal.desktop.gnome
+Interfaces=org.freedesktop.impl.portal.Access
+UseIn=gnome
--- a/data/org.gnome.Shell.PortalHelper.desktop.in.in
+++ b/data/org.gnome.Shell.PortalHelper.desktop.in.in
@ -1,9 +1,10 @@
 [Desktop Entry]
-_Name=Network Login
+Name=Network Login
 Type=Application
 Exec=gapplication launch org.gnome.Shell.PortalHelper
 DBusActivatable=true
 NoDisplay=true
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=network-workgroup
 StartupNotify=true
 OnlyShowIn=GNOME;
--- a/data/org.gnome.Shell.desktop.in.in
+++ b/data/org.gnome.Shell.desktop.in.in
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=GNOME Shell
-_Comment=Window management and application launching
+Name=GNOME Shell
+Comment=Window management and application launching
 Exec=@bindir@/gnome-shell
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -3,84 +3,84 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="development-tools" type="b">
      <default>true</default>
-      <_summary>
+      <summary>
        Enable internal tools useful for developers and testers from Alt-F2
-      </_summary>
-      <_description>
+      </summary>
+      <description>
        Allows access to internal debugging and monitoring tools
        using the Alt-F2 dialog.
-      </_description>
+      </description>
    </key>
    <key name="enabled-extensions" type="as">
      <default>[]</default>
-      <_summary>UUIDs of extensions to enable</_summary>
-      <_description>
+      <summary>UUIDs of extensions to enable</summary>
+      <description>
        GNOME Shell extensions have a UUID property; this key lists extensions
        which should be loaded. Any extension that wants to be loaded needs
        to be in this list. You can also manipulate this list with the
        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
-      </_description>
+      </description>
    </key>
    <key name="disable-extension-version-validation" type="b">
-      <default>false</default>
-      <_summary>Disables the validation of extension version compatibility</_summary>
-      <_description>
+      <default>true</default>
+      <summary>Disables the validation of extension version compatibility</summary>
+      <description>
        GNOME Shell will only load extensions that claim to support the current
        running version. Enabling this option will disable this check and try to
        load all extensions regardless of the versions they claim to support.
-      </_description>
+      </description>
    </key>
    <key name="favorite-apps" type="as">
      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-      <_summary>List of desktop file IDs for favorite applications</_summary>
-      <_description>
+      <summary>List of desktop file IDs for favorite applications</summary>
+      <description>
        The applications corresponding to these identifiers
        will be displayed in the favorites area.
-      </_description>
+      </description>
    </key>
    <key name="app-picker-view" type="u">
      <default>0</default>
-      <_summary>App Picker View</_summary>
-      <_description>
+      <summary>App Picker View</summary>
+      <description>
        Index of the currently selected view in the application picker.
-      </_description>
+      </description>
    </key>
    <key name="command-history" type="as">
      <default>[]</default>
-      <_summary>History for command (Alt-F2) dialog</_summary>
+      <summary>History for command (Alt-F2) dialog</summary>
    </key>
    <key name="looking-glass-history" type="as">
      <default>[]</default>
-      <!-- Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass -->
-      <_summary>History for the looking glass dialog</_summary>
+      <!-- Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass -->
+      <summary>History for the looking glass dialog</summary>
    </key>
    <key name="always-show-log-out" type="b">
      <default>false</default>
-      <_summary>Always show the 'Log out' menu item in the user menu.</_summary>
-      <_description>
+      <summary>Always show the 'Log out' menu item in the user menu.</summary>
+      <description>
        This key overrides the automatic hiding of the 'Log out'
        menu item in single-user, single-session situations.
-      </_description>
+      </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>
+      <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>
+      </description>
    </key>
    <key name="had-bluetooth-devices-setup" type="b">
      <default>false</default>
-      <_summary>Whether the default Bluetooth adapter had set up devices associated to it</_summary>
-      <_description>
+      <summary>Whether the default Bluetooth adapter had set up devices associated to it</summary>
+      <description>
        The shell will only show a Bluetooth menu item if a Bluetooth
        adapter is powered, or if there were devices set up associated
        with the default adapter. This will be reset if the default
        adapter is ever seen not to have devices associated to it.
-      </_description>
+      </description>
    </key>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
@ -90,44 +90,44 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="open-application-menu" type="as">
      <default>["&lt;Super&gt;F10"]</default>
-      <_summary>Keybinding to open the application menu</_summary>
-      <_description>
+      <summary>Keybinding to open the application menu</summary>
+      <description>
        Keybinding to open the application menu.
-      </_description>
+      </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>
+      <summary>Keybinding to open the "Show Applications" view</summary>
+      <description>
        Keybinding to open the "Show Applications" view of the Activities
        Overview.
-      </_description>
+      </description>
    </key>
    <key name="toggle-overview" type="as">
      <default>["&lt;Super&gt;s"]</default>
-      <_summary>Keybinding to open the overview</_summary>
-      <_description>
+      <summary>Keybinding to open the overview</summary>
+      <description>
        Keybinding to open the Activities Overview.
-      </_description>
+      </description>
    </key>
    <key name="toggle-message-tray" type="as">
      <default>["&lt;Super&gt;v","&lt;Super&gt;m"]</default>
-      <_summary>Keybinding to toggle the visibility of the notification list</_summary>
-      <_description>
+      <summary>Keybinding to toggle the visibility of the notification list</summary>
+      <description>
        Keybinding to toggle the visibility of the notification list.
-      </_description>
+      </description>
    </key>
    <key name="focus-active-notification" type="as">
      <default>["&lt;Super&gt;n"]</default>
-      <_summary>Keybinding to focus the active notification</_summary>
-      <_description>
+      <summary>Keybinding to focus the active notification</summary>
+      <description>
        Keybinding to focus the active notification.
-      </_description>
+      </description>
    </key>
    <key name="pause-resume-tweens" type="as">
      <default>[]</default>
-      <_summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</_summary>
-      <_description></_description>
+      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
+      <description></description>
    </key>
  </schema>

@ -135,10 +135,10 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="keyboard-type" type="s">
      <default>'touch'</default>
-      <_summary>Which keyboard to use</_summary>
-      <_description>
+      <summary>Which keyboard to use</summary>
+      <description>
        The type of keyboard to use.
-      </_description>
+      </description>
    </key>
  </schema>

@ -147,11 +147,11 @@
          gettext-domain="@GETTEXT_PACKAGE@">
    <key type="b" name="current-workspace-only">
      <default>false</default>
-      <_summary>Limit switcher to current workspace.</_summary>
-      <_description>
+      <summary>Limit switcher to current workspace.</summary>
+      <description>
 	If true, only applications that have windows on the current workspace are shown in the switcher.
 	Otherwise, all applications are included.
-      </_description>
+      </description>
    </key>
  </schema>

@ -165,20 +165,20 @@
          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>
+      <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>
+      </description>
    </key>
    <key type="b" name="current-workspace-only">
      <default>true</default>
-      <_summary>Limit switcher to current workspace.</_summary>
-      <_description>
+      <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>
+      </description>
    </key>
  </schema>

@ -186,43 +186,43 @@
 	  gettext-domain="@GETTEXT_PACKAGE@">
    <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="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">
      <default>true</default>
-      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
-      <_description>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
    </key>
  </schema>
 </schemalist>
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@ -427,6 +427,29 @@ StScrollBar {
 .audio-selection-device-icon {
  icon-size: 64px; }

+/* Access Dialog */
+.access-dialog {
+  spacing: 30px; }
+
+.access-dialog-main-layout {
+  padding: 12px 20px 0;
+  spacing: 12px; }
+
+.access-dialog-content {
+  max-width: 28em;
+  spacing: 20px; }
+
+.access-dialog-icon {
+  min-width: 48px;
+  icon-size: 48px; }
+
+.access-dialog-title {
+  font-weight: bold; }
+
+.access-dialog-subtitle {
+  color: #999999;
+  font-weight: bold; }
+
 /* Geolocation Dialog */
 .geolocation-dialog {
  spacing: 30px; }
@ -581,6 +604,10 @@ StScrollBar {
  width: 96px;
  height: 96px; }

+/* Window Cycler */
+.cycler-highlight {
+  border: 5px solid #215d9c; }
+
 /* Workspace Switcher */
 .workspace-switcher-group {
  padding: 12px; }
@ -769,7 +796,7 @@ StScrollBar {
  border-radius: 1.4em; }
  .calendar-day-base:hover, .calendar-day-base:focus {
    background-color: #0d0d0d; }
-  .calendar-day-base:active {
+  .calendar-day-base:active, .calendar-day-base:selected {
    color: white;
    background-color: #215d9c;
    border-color: transparent; }
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -427,6 +427,29 @@ StScrollBar {
 .audio-selection-device-icon {
  icon-size: 64px; }

+/* Access Dialog */
+.access-dialog {
+  spacing: 30px; }
+
+.access-dialog-main-layout {
+  padding: 12px 20px 0;
+  spacing: 12px; }
+
+.access-dialog-content {
+  max-width: 28em;
+  spacing: 20px; }
+
+.access-dialog-icon {
+  min-width: 48px;
+  icon-size: 48px; }
+
+.access-dialog-title {
+  font-weight: bold; }
+
+.access-dialog-subtitle {
+  color: #8e8e80;
+  font-weight: bold; }
+
 /* Geolocation Dialog */
 .geolocation-dialog {
  spacing: 30px; }
@ -581,6 +604,10 @@ StScrollBar {
  width: 96px;
  height: 96px; }

+/* Window Cycler */
+.cycler-highlight {
+  border: 5px solid #215d9c; }
+
 /* Workspace Switcher */
 .workspace-switcher-group {
  padding: 12px; }
@ -769,7 +796,7 @@ StScrollBar {
  border-radius: 1.4em; }
  .calendar-day-base:hover, .calendar-day-base:focus {
    background-color: #454c4c; }
-  .calendar-day-base:active {
+  .calendar-day-base:active, .calendar-day-base:selected {
    color: white;
    background-color: #215d9c;
    border-color: transparent; }
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -804,6 +804,11 @@ const LoginDialog = new Lang.Class({

        this._user = null;

+        if (this._nextSignalId) {
+            this._authPrompt.disconnect(this._nextSignalId);
+            this._nextSignalId = 0;
+        }
+
        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
            if (!this._disableUserList)
                this._showUserList();
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@ -31,6 +31,7 @@

    <file>portalHelper/main.js</file>

+    <file>ui/accessDialog.js</file>
    <file>ui/altTab.js</file>
    <file>ui/animation.js</file>
    <file>ui/appDisplay.js</file>
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@ -0,0 +1,202 @@
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const CheckBox = imports.ui.checkBox;
+const ModalDialog = imports.ui.modalDialog;
+
+const RequestIface = '<node> \
+<interface name="org.freedesktop.impl.portal.Request"> \
+<method name="Close"/> \
+</interface> \
+</node>';
+
+const AccessIface = '<node> \
+<interface name="org.freedesktop.impl.portal.Access"> \
+<method name="AccessDialog"> \
+  <arg type="o" name="handle" direction="in"/> \
+  <arg type="s" name="app_id" direction="in"/> \
+  <arg type="s" name="parent_window" direction="in"/> \
+  <arg type="s" name="title" direction="in"/> \
+  <arg type="s" name="subtitle" direction="in"/> \
+  <arg type="s" name="body" direction="in"/> \
+  <arg type="a{sv}" name="options" direction="in"/> \
+  <arg type="u" name="response" direction="out"/> \
+  <arg type="a{sv}" name="results" direction="out"/> \
+</method> \
+</interface> \
+</node>';
+
+const DialogResponse = {
+    OK: 0,
+    CANCEL: 1,
+    CLOSED: 2
+};
+
+const AccessDialog = new Lang.Class({
+    Name: 'AccessDialog',
+    Extends: ModalDialog.ModalDialog,
+
+    _init: function(invocation, handle, title, subtitle, body, options) {
+        this.parent({ styleClass: 'access-dialog' });
+
+        this._invocation = invocation;
+        this._handle = handle;
+
+        this._requestExported = false;
+        this._request = Gio.DBusExportedObject.wrapJSObject(RequestIface, this);
+
+        for (let option in options)
+            options[option] = options[option].deep_unpack();
+
+        this._buildLayout(title, subtitle, body, options);
+    },
+
+    _buildLayout: function(title, subtitle, body, options) {
+        // No support for non-modal system dialogs, so ignore the option
+        //let modal = options['modal'] || true;
+        let denyLabel = options['deny_label'] || _("Deny Access");
+        let grantLabel = options['grant_label'] || _("Grant Access");
+        let iconName = options['icon'] || null;
+        let choices = options['choices'] || [];
+
+        let mainContentBox = new St.BoxLayout();
+        mainContentBox.style_class = 'access-dialog-main-layout';
+        this.contentLayout.add_actor(mainContentBox);
+
+        let icon = new St.Icon({ style_class: 'access-dialog-icon',
+                                 icon_name: iconName,
+                                 y_align: Clutter.ActorAlign.START });
+        mainContentBox.add_actor(icon);
+
+        let messageBox = new St.BoxLayout({ vertical: true });
+        messageBox.style_class = 'access-dialog-content',
+        mainContentBox.add_actor(messageBox);
+
+        let label;
+        label = new St.Label({ style_class: 'access-dialog-title headline',
+                               text: title });
+        messageBox.add_actor(label);
+
+        label = new St.Label({ style_class: 'access-dialog-subtitle',
+                               text: subtitle });
+        label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        label.clutter_text.line_wrap = true;
+        messageBox.add_actor(label);
+
+        this._choices = new Map();
+
+        for (let i = 0; i < choices.length; i++) {
+            let [id, name, opts, selected] = choices[i];
+            if (opts.length > 0)
+                continue; // radio buttons, not implemented
+
+            let check = new CheckBox.CheckBox();
+            check.getLabelActor().text = name;
+            check.actor.checked = selected == "true";
+            messageBox.add_actor(check.actor);
+
+            this._choices.set(id, check);
+        }
+
+        label = new St.Label({ text: body });
+        label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        label.clutter_text.line_wrap = true;
+        messageBox.add_actor(label);
+
+        this.addButton({ label: denyLabel,
+                         action: () => {
+                             this._sendResponse(DialogResponse.CANCEL);
+                         },
+                         key: Clutter.KEY_Escape });
+        this.addButton({ label: grantLabel,
+                         action: () => {
+                             this._sendResponse(DialogResponse.OK);
+                         }});
+    },
+
+    open: function() {
+        this.parent();
+
+        let connection = this._invocation.get_connection();
+        this._requestExported = this._request.export(connection, this._handle);
+    },
+
+    CloseAsync: function(invocation, params) {
+        if (this._invocation.get_sender() != invocation.get_sender()) {
+            invocation.return_error_literal(Gio.DBusError,
+                                            Gio.DBusError.ACCESS_DENIED,
+                                            '');
+            return;
+        }
+
+        this._sendResponse(DialogResponse.CLOSED);
+    },
+
+    _sendResponse: function(response) {
+        if (this._requestExported)
+            this._request.unexport();
+        this._requestExported = false;
+
+        let results = {};
+        if (response == DialogResponse.OK) {
+            for (let [id, check] of this._choices) {
+                let checked = check.actor.checked ? 'true' : 'false';
+                results[id] = new GLib.Variant('s', checked);
+            }
+        }
+
+        // Delay actual response until the end of the close animation (if any)
+        this.connect('closed', () => {
+            this._invocation.return_value(new GLib.Variant('(ua{sv})',
+                                                           [response, results]));
+        });
+        this.close();
+    }
+});
+
+const AccessDialogDBus = new Lang.Class({
+    Name: 'AccessDialogDBus',
+
+    _init: function() {
+        this._accessDialog = null;
+
+        this._windowTracker = Shell.WindowTracker.get_default();
+
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AccessIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/portal/desktop');
+
+        Gio.DBus.session.own_name('org.freedesktop.impl.portal.desktop.gnome', Gio.BusNameOwnerFlags.REPLACE, null, null);
+    },
+
+    AccessDialogAsync: function(params, invocation) {
+        if (this._accessDialog) {
+            invocation.return_error_literal(Gio.DBusError,
+                                            Gio.DBusError.LIMITS_EXCEEDED,
+                                            'Already showing a system access dialog');
+            return;
+        }
+
+        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
+        // We probably want to use parentWindow and global.display.focus_window
+        // for this check in the future
+        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
+            invocation.return_error_literal(Gio.DBusError,
+                                            Gio.DBusError.ACCESS_DENIED,
+                                            'Only the focused app is allowed to show a system access dialog');
+            return;
+        }
+
+        let dialog = new AccessDialog(invocation, handle, title,
+                                      subtitle, body, options);
+        dialog.open();
+
+        dialog.connect('closed', () => { this._accessDialog = null; });
+
+        this._accessDialog = dialog;
+    }
+});
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -354,6 +354,67 @@ const AppSwitcherPopup = new Lang.Class({
    }
 });

+const CyclerHighlight = new Lang.Class({
+    Name: 'CyclerHighlight',
+
+    _init: function() {
+        this._window = null;
+
+        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout() });
+
+        this._clone = new Clutter.Clone();
+        this.actor.add_actor(this._clone);
+
+        this._highlight = new St.Widget({ style_class: 'cycler-highlight' });
+        this.actor.add_actor(this._highlight);
+
+        let coordinate = Clutter.BindCoordinate.ALL;
+        let constraint = new Clutter.BindConstraint({ coordinate: coordinate });
+        this._clone.bind_property('source', constraint, 'source', 0);
+
+        this.actor.add_constraint(constraint);
+
+        this.actor.connect('notify::allocation',
+                           Lang.bind(this, this._onAllocationChanged));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+    },
+
+    set window(w) {
+        if (this._window == w)
+            return;
+
+        this._window = w;
+
+        if (this._clone.source)
+            this._clone.source.show();
+
+        let windowActor = this._window ? this._window.get_compositor_private()
+                                       : null;
+
+        if (windowActor)
+            windowActor.hide();
+
+        this._clone.source = windowActor;
+    },
+
+    _onAllocationChanged: function() {
+        if (!this._window) {
+            this._highlight.set_size(0, 0);
+            this._highlight.hide();
+        } else {
+            let [x, y] = this.actor.allocation.get_origin();
+            let rect = this._window.get_frame_rect();
+            this._highlight.set_size(rect.width, rect.height);
+            this._highlight.set_position(rect.x - x, rect.y - y);
+            this._highlight.show();
+        }
+    },
+
+    _onDestroy: function() {
+        this.window = null;
+    }
+});
+
 const CyclerPopup = new Lang.Class({
    Name: 'CyclerPopup',
    Extends: SwitcherPopup.SwitcherPopup,
@ -367,6 +428,9 @@ const CyclerPopup = new Lang.Class({
        if (this._items.length == 0)
            return;

+        this._highlight = new CyclerHighlight();
+        global.window_group.add_actor(this._highlight.actor);
+
        // We don't show an actual popup, so just provide what SwitcherPopup
        // expects instead of inheriting from SwitcherList
        this._switcherList = { actor: new St.Widget(),
@ -375,11 +439,18 @@ const CyclerPopup = new Lang.Class({
    },

    _highlightItem: function(index, justOutline) {
-        Main.activateWindow(this._items[index]);
+        this._highlight.window = this._items[index];
+        global.window_group.set_child_above_sibling(this._highlight.actor, null);
    },

    _finish: function() {
-        this._highlightItem(this._selectedIndex);
+        Main.activateWindow(this._items[this._selectedIndex]);
+
+        this.parent();
+    },
+
+    _onDestroy: function() {
+        this._highlight.actor.destroy();

        this.parent();
    }
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -696,6 +696,7 @@ const BackgroundManager = new Lang.Class({
                           time: FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: function() {
+                               oldBackgroundActor.background.run_dispose();
                               oldBackgroundActor.destroy();
                           }
                         });
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -120,6 +120,9 @@ const EmptyEventSource = new Lang.Class({
    destroy: function() {
    },

+    ignoreEvent: function(event) {
+    },
+
    requestRange: function(begin, end) {
    },

@ -184,6 +187,15 @@ const DBusEventSource = new Lang.Class({
        this.isLoading = false;
        this.isDummy = false;

+        this._ignoredEvents = new Map();
+
+        let savedState = global.get_persistent_state('as', 'ignored_events');
+        if (savedState)
+            savedState.deep_unpack().forEach(Lang.bind(this,
+                function(eventId) {
+                    this._ignoredEvents.set(eventId, true);
+                }));
+
        this._initialized = false;
        this._dbusProxy = new CalendarServer();
        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
@ -298,6 +310,16 @@ const DBusEventSource = new Lang.Class({
        }
    },

+    ignoreEvent: function(event) {
+        if (this._ignoredEvents.get(event.id))
+            return;
+
+        this._ignoredEvents.set(event.id, true);
+        let savedState = new GLib.Variant('as', [...this._ignoredEvents.keys()]);
+        global.set_persistent_state('ignored_events', savedState);
+        this.emit('changed');
+    },
+
    requestRange: function(begin, end) {
        if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
            this.isLoading = true;
@ -313,6 +335,10 @@ const DBusEventSource = new Lang.Class({
        let result = [];
        for(let n = 0; n < this._events.length; n++) {
            let event = this._events[n];
+
+            if (this._ignoredEvents.has(event.id))
+                continue;
+
            if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
                result.push(event);
            }
@ -660,12 +686,12 @@ const Calendar = new Lang.Class({

        this._buttons.forEach(Lang.bind(this, function(button) {
            if (sameDay(button._date, this._selectedDate)) {
-                button.add_style_pseudo_class('active');
+                button.add_style_pseudo_class('selected');
                if (this._shouldDateGrabFocus)
                    button.grab_key_focus();
            }
            else
-                button.remove_style_pseudo_class('active');
+                button.remove_style_pseudo_class('selected');
        }));
    }
 });
@ -785,15 +811,6 @@ const EventsSection = new Lang.Class({
        this._desktopSettings.connect('changed', Lang.bind(this, this._reloadEvents));
        this._eventSource = new EmptyEventSource();

-        this._ignoredEvents = new Map();
-
-        let savedState = global.get_persistent_state('as', 'ignored_events');
-        if (savedState)
-            savedState.deep_unpack().forEach(Lang.bind(this,
-                function(eventId) {
-                    this._ignoredEvents.set(eventId, true);
-                }));
-
        this.parent('');

        Shell.AppSystem.get_default().connect('installed-changed',
@ -802,9 +819,7 @@ const EventsSection = new Lang.Class({
    },

    _ignoreEvent: function(event) {
-        this._ignoredEvents.set(event.id, true);
-        let savedState = new GLib.Variant('as', [...this._ignoredEvents.keys()]);
-        global.set_persistent_state('ignored_events', savedState);
+        this._eventSource.ignoreEvent(event);
    },

    setEventSource: function(eventSource) {
@ -850,9 +865,6 @@ const EventsSection = new Lang.Class({
        for (let i = 0; i < events.length; i++) {
            let event = events[i];

-            if (this._ignoredEvents.has(event.id))
-                continue;
-
            let message = new EventMessage(event, this._date);
            message.connect('close', Lang.bind(this, function() {
                this._ignoreEvent(event);
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -475,6 +475,11 @@ const ChatSource = new Lang.Class({
            this._channel.close_async(function(channel, result) {
                channel.close_finish(result);
            });
+        } else {
+            // Don't indicate any unread messages when the notification
+            // that represents them has been destroyed.
+            this._pendingMessages = [];
+            this.countUpdated();
        }

        // Keep source alive while the channel is open
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /*
- * Copyright 2010 Red Hat, Inc
+ * Copyright 2010-2016 Red Hat, Inc
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -114,7 +114,7 @@ const restartDialogContent = {
    showOtherSessions: true,
 };

-const restartInstallDialogContent = {
+const restartUpdateDialogContent = {

    subject: C_("title", "Restart & Install Updates"),
    description: function(seconds) {
@ -132,18 +132,38 @@ const restartInstallDialogContent = {
    showOtherSessions: true,
 };

+const restartUpgradeDialogContent = {
+
+    subject: C_("title", "Restart & Install Upgrade"),
+    upgradeDescription: function(distroName, distroVersion) {
+        /* Translators: This is the text displayed for system upgrades in the
+           shut down dialog. First %s gets replaced with the distro name and
+           second %s with the distro version to upgrade to */
+        return _("%s %s will be installed after restart. Upgrade installation can take a long time: ensure that you have backed up and that the computer is plugged in.").format(distroName, distroVersion);
+    },
+    disableTimer: true,
+    showBatteryWarning: false,
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       label:  C_("button", "Restart &amp; Install") }],
+    iconName: 'view-refresh-symbolic',
+    iconStyleClass: 'end-session-dialog-shutdown-icon',
+    showOtherSessions: true,
+};
+
 const DialogType = {
  LOGOUT: 0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */,
  SHUTDOWN: 1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */,
  RESTART: 2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */,
-  UPDATE_RESTART: 3
+  UPDATE_RESTART: 3,
+  UPGRADE_RESTART: 4
 };

 const DialogContent = {
    0 /* DialogType.LOGOUT */: logoutDialogContent,
    1 /* DialogType.SHUTDOWN */: shutdownDialogContent,
    2 /* DialogType.RESTART */: restartDialogContent,
-    3 /* DialogType.UPDATE_RESTART */: restartInstallDialogContent
+    3 /* DialogType.UPDATE_RESTART */: restartUpdateDialogContent,
+    4 /* DialogType.UPGRADE_RESTART */: restartUpgradeDialogContent
 };

 const MAX_USERS_IN_SESSION_DIALOG = 5;
@ -163,7 +183,10 @@ const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 const PkOfflineIface = '<node> \
 <interface name="org.freedesktop.PackageKit.Offline"> \
    <property name="UpdatePrepared" type="b" access="read"/> \
-    <property name="TriggerAction" type="s" access="read"/> \
+    <property name="UpdateTriggered" type="b" access="read"/> \
+    <property name="UpgradePrepared" type="b" access="read"/> \
+    <property name="UpgradeTriggered" type="b" access="read"/> \
+    <property name="PreparedUpgrade" type="a{sv}" access="read"/> \
    <method name="Trigger"> \
        <arg type="s" name="action" direction="in"/> \
    </method> \
@ -415,11 +438,19 @@ const EndSessionDialog = new Lang.Class({

                if (dialogContent.descriptionWithUser)
                    description = dialogContent.descriptionWithUser(realName, displayTime);
-                else
-                    description = dialogContent.description(displayTime);
            }
        }

+        // Use a different description when we are installing a system upgrade
+        if (dialogContent.upgradeDescription) {
+            let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
+            let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
+
+            if (name != null && version != null)
+                description = dialogContent.upgradeDescription(name, version);
+        }
+
+        // Fall back to regular description
        if (!description)
            description = dialogContent.description(displayTime);

@ -698,9 +729,12 @@ const EndSessionDialog = new Lang.Class({
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._type = type;

-        if (this._type == DialogType.RESTART &&
-            this._pkOfflineProxy.TriggerAction == 'reboot')
-            this._type = DialogType.UPDATE_RESTART;
+        if (this._type == DialogType.RESTART) {
+            if (this._pkOfflineProxy.UpdateTriggered)
+                this._type = DialogType.UPDATE_RESTART;
+            else if (this._pkOfflineProxy.UpgradeTriggered)
+                this._type = DialogType.UPGRADE_RESTART;
+        }

        this._applications = [];
        this._applicationList.destroy_all_children();
@ -727,19 +761,19 @@ const EndSessionDialog = new Lang.Class({
        if (dialogContent.showOtherSessions)
            this._loadSessions();

-        let updateAlreadyTriggered = this._pkOfflineProxy.TriggerAction == 'power-off' || this._pkOfflineProxy.TriggerAction == 'reboot';
+        let updateTriggered = this._pkOfflineProxy.UpdateTriggered;
        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
        this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
-        this._checkBox.actor.checked = (updatePrepared && updateAlreadyTriggered);
+        this._checkBox.actor.checked = (updatePrepared && updateTriggered);

        // We show the warning either together with the checkbox, or when
        // updates have already been triggered, but the user doesn't have
        // enough permissions to cancel them.
        this._batteryWarning.visible = (dialogContent.showBatteryWarning &&
-                                        (this._checkBox.actor.visible || updatePrepared && updateAlreadyTriggered && !updatesAllowed));
+                                        (this._checkBox.actor.visible || updatePrepared && updateTriggered && !updatesAllowed));

        this._updateButtons();

@ -749,7 +783,9 @@ const EndSessionDialog = new Lang.Class({
            return;
        }

-        this._startTimer();
+        if (!dialogContent.disableTimer)
+            this._startTimer();
+
        this._sync();

        let signalId = this.connect('opened',
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -10,6 +10,7 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
+const InputSourceManager = imports.ui.status.keyboard;

 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;
@ -757,19 +758,48 @@ const ShellWaylandAdapter = new Lang.Class({
    Name: 'ShellWaylandAdapter',
    Extends: Caribou.XAdapter,

+    _init: function () {
+        this.parent();
+        let deviceManager = Clutter.DeviceManager.get_default();
+        this._virtualDevice = deviceManager.create_virtual_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
+
+        this._inputSourceManager = InputSourceManager.getInputSourceManager();
+        this._sourceChangedId = this._inputSourceManager.connect('current-source-changed',
+                                                                 Lang.bind(this, this._onSourceChanged));
+        this._sourcesModifiedId = this._inputSourceManager.connect ('sources-changed',
+                                                                    Lang.bind(this, this._onSourcesModified));
+    },
+
+    _onSourcesModified: function () {
+        this.emit('config-changed');
+    },
+
+    _onSourceChanged: function (inputSourceManager, oldSource) {
+        let source = inputSourceManager.currentSource;
+        this.emit('group-changed', source.index, source.id, '');
+    },
+
+    vfunc_get_groups: function () {
+        let inputSources = this._inputSourceManager.inputSources;
+        let groups = []
+        let variants = [];
+
+        for (let i in inputSources) {
+            let is = inputSources[i];
+            groups[is.index] = is.id;
+            variants[is.index] = '';
+        }
+
+        return [groups, groups.length, variants, variants.length];
+    },
+
    vfunc_keyval_press: function(keyval) {
-        let focus = global.stage.get_key_focus();
-        if (focus instanceof Clutter.Text)
-            Shell.util_text_insert_keyval(focus, keyval);
-        else
-            this.parent(keyval);
+        this._virtualDevice.notify_keyval(Clutter.get_current_event_time(),
+                                          keyval, Clutter.KeyState.PRESSED);
    },

    vfunc_keyval_release: function(keyval) {
-        let focus = global.stage.get_key_focus();
-        if (focus instanceof Clutter.Text)
-            return;             // do nothing
-        else
-            this.parent(keyval);
+        this._virtualDevice.notify_keyval(Clutter.get_current_event_time(),
+                                          keyval, Clutter.KeyState.RELEASED);
    },
 });
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -220,7 +220,8 @@ const LayoutManager = new Lang.Class({
        global.stage.add_child(this.uiGroup);

        this.overviewGroup = new St.Widget({ name: 'overviewGroup',
-                                             visible: false });
+                                             visible: false,
+                                             reactive: true });
        this.addChrome(this.overviewGroup);

        this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
@ -591,7 +592,10 @@ const LayoutManager = new Lang.Class({
        this.addChrome(this._coverPane);

        if (Meta.is_restart()) {
-            // On restart, we don't do an animation
+            // On restart, we don't do an animation. Force an update of the
+            // regions immediately so that maximized windows restore to the
+            // right size taking struts into account.
+            this._updateRegions();
        } else if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
@ -938,6 +942,11 @@ const LayoutManager = new Lang.Class({
        if (Main.modalCount > 0)
            return GLib.SOURCE_REMOVE;

+        // Bug workaround - get_transformed_position()/get_transformed_size() don't work after
+        // a change in stage size until the first pick or paint.
+        // https://bugzilla.gnome.org/show_bug.cgi?id=761565
+        global.stage.get_actor_at_pos(Clutter.PickMode.ALL, 0, 0);
+
        let rects = [], struts = [], i;
        let isPopupMenuVisible = global.top_window_group.get_children().some(isPopupMetaWindow);
        let wantsInputRegion = !isPopupMenuVisible;
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -11,6 +11,7 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

+const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;
 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
@ -63,6 +64,7 @@ let ctrlAltTabManager = null;
 let osdWindowManager = null;
 let osdMonitorLabeler = null;
 let sessionMode = null;
+let shellAccessDialogDBusService = null;
 let shellAudioSelectionDBusService = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
@ -122,6 +124,7 @@ function start() {
                                       _loadDefaultStylesheet);
    _initializeUI();

+    shellAccessDialogDBusService = new AccessDialog.AccessDialogDBus();
    shellAudioSelectionDBusService = new AudioDeviceSelection.AudioDeviceSelectionDBus();
    shellDBusService = new ShellDBus.GnomeShell();
    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
@ -191,6 +194,8 @@ function _initializeUI() {
        return true;
    });

+    global.display.connect('gl-video-memory-purged', loadTheme);
+
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -27,6 +27,8 @@ const LevelBar = new Lang.Class({
        this._bar = new St.Widget({ style_class: 'level-bar' });

        this.actor.set_child(this._bar);
+
+        this.actor.connect('notify::width', () => { this.level = this.level; });
    },

    get level() {
@ -34,14 +36,44 @@ const LevelBar = new Lang.Class({
    },

    set level(value) {
-        let newValue = Math.max(0, Math.min(value, 100));
-        if (newValue == this._level)
-            return;
-        this._level = newValue;
+        this._level = Math.max(0, Math.min(value, 100));

-        let width = this.actor.width;
-        width *= (this._level / 100.);
-        this._bar.width = width;
+        let alloc = this.actor.get_allocation_box();
+        let newWidth = Math.round((alloc.x2 - alloc.x1) * this._level / 100);
+        if (newWidth != this._bar.width)
+            this._bar.width = newWidth;
+    }
+});
+
+const OsdWindowConstraint = new Lang.Class({
+    Name: 'OsdWindowConstraint',
+    Extends: Clutter.Constraint,
+
+    _init: function(props) {
+        this._minSize = 0;
+        this.parent(props);
+    },
+
+    set minSize(v) {
+        this._minSize = v;
+        if (this.actor)
+            this.actor.queue_relayout();
+    },
+
+    vfunc_update_allocation: function(actor, actorBox) {
+        // Clutter will adjust the allocation for margins,
+        // so add it to our minimum size
+        let minSize = this._minSize + actor.margin_top + actor.margin_bottom;
+        let [width, height] = actorBox.get_size();
+
+        // Enforce a ratio of 1
+        let size = Math.ceil(Math.max(minSize, height));
+        actorBox.set_size(size, size);
+
+        // Recenter
+        let [x, y] = actorBox.get_origin();
+        actorBox.set_origin(Math.floor(x + width / 2 - size / 2),
+                            Math.floor(y + height / 2 - size / 2));
    }
 });

@ -49,7 +81,6 @@ const OsdWindow = new Lang.Class({
    Name: 'OsdWindow',

    _init: function(monitorIndex) {
-        this._popupSize = 0;
        this.actor = new St.Widget({ x_expand: true,
                                     y_expand: true,
                                     x_align: Clutter.ActorAlign.CENTER,
@ -59,19 +90,12 @@ const OsdWindow = new Lang.Class({
        let constraint = new Layout.MonitorConstraint({ index: monitorIndex });
        this.actor.add_constraint(constraint);

+        this._boxConstraint = new OsdWindowConstraint();
        this._box = new St.BoxLayout({ style_class: 'osd-window',
                                       vertical: true });
+        this._box.add_constraint(this._boxConstraint);
        this.actor.add_actor(this._box);

-        this._box.connect('style-changed', Lang.bind(this, this._onStyleChanged));
-        this._box.connect('notify::height', Lang.bind(this,
-            function() {
-                Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
-                    function() {
-                        this._box.width = this._box.height;
-                    }));
-            }));
-
        this._icon = new St.Icon();
        this._box.add(this._icon, { expand: true });

@ -173,30 +197,12 @@ const OsdWindow = new Lang.Class({
        let scalew = monitor.width / 640.0;
        let scaleh = monitor.height / 480.0;
        let scale = Math.min(scalew, scaleh);
-        this._popupSize = 110 * Math.max(1, scale);
+        let popupSize = 110 * Math.max(1, scale);

        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._icon.icon_size = this._popupSize / (2 * scaleFactor);
+        this._icon.icon_size = popupSize / (2 * scaleFactor);
        this._box.translation_y = monitor.height / 4;
-        this._box.style_changed();
-    },
-
-    _onStyleChanged: function() {
-        let themeNode = this._box.get_theme_node();
-        let horizontalPadding = themeNode.get_horizontal_padding();
-        let verticalPadding = themeNode.get_vertical_padding();
-        let topBorder = themeNode.get_border_width(St.Side.TOP);
-        let bottomBorder = themeNode.get_border_width(St.Side.BOTTOM);
-        let leftBorder = themeNode.get_border_width(St.Side.LEFT);
-        let rightBorder = themeNode.get_border_width(St.Side.RIGHT);
-
-        let minWidth = this._popupSize - verticalPadding - leftBorder - rightBorder;
-        let minHeight = this._popupSize - horizontalPadding - topBorder - bottomBorder;
-
-        // minWidth/minHeight here are in real pixels,
-        // but the theme takes measures in unscaled dimensions
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight) / scaleFactor);
+        this._boxConstraint.minSize = popupSize;
    }
 });

--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -107,18 +107,12 @@ const Overview = new Lang.Class({

        this._overviewCreated = true;

-        let layout = new Clutter.BinLayout();
-        this._stack = new Clutter.Actor({ layout_manager: layout });
-        this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
-
        /* 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,
-                                            x_expand: true,
-                                            y_expand: true });
+                                            vertical: true });
+        this._overview.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
        this._overview._delegate = this;

        // The main Background actors are inside global.window_group which are
@ -126,7 +120,7 @@ const Overview = new Lang.Class({
        // one. Instances of this class share a single CoglTexture behind the
        // scenes which allows us to show the background with different
        // rendering options without duplicating the texture data.
-        this._backgroundGroup = new Meta.BackgroundGroup();
+        this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
        this._bgManagers = [];

@ -149,8 +143,7 @@ const Overview = new Lang.Class({
        Main.layoutManager.overviewGroup.add_child(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return Clutter.EVENT_STOP; }));

-        this._stack.add_actor(this._overview);
-        Main.layoutManager.overviewGroup.add_child(this._stack);
+        Main.layoutManager.overviewGroup.add_child(this._overview);

        this._coverPane.hide();

@ -159,6 +152,9 @@ const Overview = new Lang.Class({
            dragMotion: Lang.bind(this, this._onDragMotion)
        };

+
+        Main.layoutManager.overviewGroup.connect('scroll-event',
+                                                 Lang.bind(this, this._onScrollEvent));
        Main.xdndHandler.connect('drag-begin', Lang.bind(this, this._onDragBegin));
        Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));

@ -255,7 +251,6 @@ const Overview = new Lang.Class({

        // Add our same-line elements after the search entry
        this._overview.add(this._controls.actor, { y_fill: true, expand: true });
-        this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));

        // TODO - recalculate everything when desktop size changes
        this.dashIconSize = this._dash.iconSize;
@ -372,7 +367,7 @@ const Overview = new Lang.Class({
        if (this.isDummy)
            return;

-        this._overview.add_action(action);
+        this._backgroundGroup.add_action(action);
    },

    _getDesktopClone: function() {
@ -552,8 +547,8 @@ const Overview = new Lang.Class({
        Meta.disable_unredirect_for_screen(global.screen);
        this.viewSelector.show();

-        this._stack.opacity = 0;
-        Tweener.addTween(this._stack,
+        this._overview.opacity = 0;
+        Tweener.addTween(this._overview,
                         { opacity: 255,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
@ -618,7 +613,7 @@ const Overview = new Lang.Class({
        this.viewSelector.animateFromOverview();

        // Make other elements fade out.
-        Tweener.addTween(this._stack,
+        Tweener.addTween(this._overview,
                         { opacity: 0,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -421,7 +421,6 @@ const ControlsManager = new Lang.Class({

        let layout = new ControlsLayout();
        this.actor = new St.Widget({ layout_manager: layout,
-                                     reactive: true,
                                     x_expand: true, y_expand: true,
                                     clip_to_allocation: true });
        this._group = new St.BoxLayout({ name: 'overview-group',
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -349,7 +349,6 @@ const Arrow = new Lang.Class({
    _init: function(params) {
        this.parent(params);
        this.x_fill = this.y_fill = true;
-        this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);

        this._drawingArea = new St.DrawingArea();
        this._drawingArea.connect('repaint', Lang.bind(this, this._drawArrow));
@ -377,6 +376,22 @@ const Arrow = new Lang.Class({
        cr.$dispose();
    },

+    vfunc_get_paint_volume: function(volume) {
+        if (!this.parent(volume))
+            return false;
+
+        if (!this._shadow)
+            return true;
+
+        let shadow_box = new Clutter.ActorBox();
+        this._shadow.get_box(this._drawingArea.get_allocation_box(), shadow_box);
+
+        volume.set_width(Math.max(shadow_box.x2 - shadow_box.x1, volume.get_width()));
+        volume.set_height(Math.max(shadow_box.y2 - shadow_box.y1, volume.get_height()));
+
+        return true;
+    },
+
    vfunc_style_changed: function() {
        let node = this.get_theme_node();
        this._shadow = node.get_shadow('-arrow-shadow');
@ -384,6 +399,8 @@ const Arrow = new Lang.Class({
            this._shadowHelper = St.ShadowHelper.new(this._shadow);
        else
            this._shadowHelper = null;
+
+        this.parent();
    },

    vfunc_paint: function() {
@ -711,7 +728,7 @@ const ScreenShield = new Lang.Class({
        let unitaryDelay = ARROW_ANIMATION_TIME / (arrows.length + 1);
        let maxOpacity = 255 * ARROW_ANIMATION_PEAK_OPACITY;
        for (let i = 0; i < arrows.length; i++) {
-            arrows.opacity = 0;
+            arrows[i].opacity = 0;
            Tweener.addTween(arrows[i],
                             { opacity: 0,
                               delay: unitaryDelay * (N_ARROWS - (i + 1)),
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -1349,9 +1349,13 @@ const WindowManager = new Lang.Class({
    _hasAttachedDialogs: function(window, ignoreWindow) {
        var count = 0;
        window.foreach_transient(function(win) {
-            if (win != ignoreWindow && win.is_attached_dialog())
+            if (win != ignoreWindow &&
+                win.is_attached_dialog() &&
+                win.get_transient_for() == window) {
                count++;
-            return false;
+                return false;
+            }
+            return true;
        });
        return count != 0;
    },
@ -1420,6 +1424,11 @@ const WindowManager = new Lang.Class({

            actor._windowType = type;
        }));
+        actor.meta_window.connect('unmanaged', Lang.bind(this, function(window) {
+                let parent = window.get_transient_for();
+                if (parent)
+                    this._checkDimming(parent);
+        }));

        if (actor.meta_window.is_attached_dialog())
            this._checkDimming(actor.get_meta_window().get_transient_for());
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -19,8 +19,7 @@ const WorkspaceSwitcherPopup = new Lang.Class({
    Name: 'WorkspaceSwitcherPopup',

    _init : function() {
-        this.actor = new St.Widget({ reactive: true,
-                                     x: 0,
+        this.actor = new St.Widget({ x: 0,
                                     y: 0,
                                     width: global.screen_width,
                                     height: global.screen_height,
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -103,7 +103,7 @@ const WorkspacesView = new Lang.Class({
                                                    page_increment: 1,
                                                    page_size: 1,
                                                    step_increment: 0,
-                                                    upper: 0 });
+                                                    upper: global.screen.n_workspaces });
        this.scrollAdjustment.connect('notify::value',
                                      Lang.bind(this, this._onScroll));

@ -374,6 +374,10 @@ const ExtraWorkspaceView = new Lang.Class({
        this._workspace.setActualGeometry(this._actualGeometry);
    },

+    getActiveWorkspace: function() {
+        return this._workspace;
+    },
+
    animateToOverview: function(animationType) {
        if (animationType == AnimationType.ZOOM)
            this._workspace.zoomToOverview();
@ -421,8 +425,10 @@ const WorkspacesDisplay = new Lang.Class({
            // 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 event = Clutter.get_current_event();
+            let index = this._getMonitorIndexForEvent(event);
            if ((action.get_button() == 1 || action.get_button() == 0) &&
-                this._getPrimaryView().getActiveWorkspace().isEmpty())
+                this._workspacesViews[index].getActiveWorkspace().isEmpty())
                Main.overview.hide();
        }));
        Main.overview.addAction(clickAction);
@ -431,11 +437,18 @@ const WorkspacesDisplay = new Lang.Class({
        let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
        panAction.connect('pan', Lang.bind(this, this._onPan));
        panAction.connect('gesture-begin', Lang.bind(this, function() {
+            if (this._workspacesOnlyOnPrimary) {
+                let event = Clutter.get_current_event();
+                if (this._getMonitorIndexForEvent(event) != this._primaryIndex)
+                    return false;
+            }
+
            for (let i = 0; i < this._workspacesViews.length; i++)
                this._workspacesViews[i].startSwipeScroll();
            return true;
        }));
        panAction.connect('gesture-cancel', Lang.bind(this, function() {
+            clickAction.release();
            for (let i = 0; i < this._workspacesViews.length; i++)
                this._workspacesViews[i].endSwipeScroll();
        }));
@ -581,6 +594,12 @@ const WorkspacesDisplay = new Lang.Class({
        }
    },

+    _getMonitorIndexForEvent: function(event) {
+        let [x, y] = event.get_coords();
+        let rect = new Meta.Rectangle({ x: x, y: y, width: 1, height: 1 });
+        return global.screen.get_monitor_index_for_rect(rect);
+    },
+
    _getPrimaryView: function() {
        if (!this._workspacesViews.length)
            return null;
@ -661,6 +680,11 @@ const WorkspacesDisplay = new Lang.Class({
    _onScrollEvent: function(actor, event) {
        if (!this.actor.mapped)
            return Clutter.EVENT_PROPAGATE;
+
+        if (this._workspacesOnlyOnPrimary &&
+            this._getMonitorIndexForEvent(event) != this._primaryIndex)
+            return Clutter.EVENT_PROPAGATE;
+
        let activeWs = global.screen.get_active_workspace();
        let ws;
        switch (event.get_scroll_direction()) {
--- a/po/Makevars
+++ b/po/Makevars
@ -0,0 +1,68 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
+        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
+        --keyword=g_dngettext:2,3 --add-comments \
+        --flag=g_dngettext:2:pass-c-format \
+        --flag=g_strdup_printf:1:c-format \
+        --flag=g_string_printf:2:c-format \
+        --flag=g_string_append_printf:2:c-format \
+        --flag=g_error_new:3:c-format \
+        --flag=g_set_error:4:c-format \
+        --flag=g_markup_printf_escaped:1:c-format \
+        --flag=g_log:3:c-format \
+        --flag=g_print:1:c-format \
+        --flag=g_printerr:1:c-format \
+        --flag=g_printf:1:c-format \
+        --flag=g_fprintf:2:c-format \
+        --flag=g_sprintf:2:c-format \
+        --flag=g_snprintf:3:c-format
+
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Translation copyright holder
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# Ignore the timestamp of the .pot file, as git clones do not have
+# deterministic timestamps, and .po files are updated by translators
+# (only) in GNOME projects.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,17 +1,17 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-data/50-gnome-shell-system.xml.in
+data/50-gnome-shell-system.xml
 data/gnome-shell-extension-prefs.desktop.in.in
 data/org.gnome.Shell.desktop.in.in
-data/org.gnome.shell.gschema.xml.in.in
-data/org.gnome.Shell.PortalHelper.desktop.in
+data/org.gnome.shell.gschema.xml.in
+data/org.gnome.Shell.PortalHelper.desktop.in.in
 js/extensionPrefs/main.js
 js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/util.js
 js/misc/util.js
 js/portalHelper/main.js
+js/ui/accessDialog.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/audioDeviceSelection.js
@ -61,7 +61,7 @@ js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
 js/ui/windowMenu.js
-src/calendar-server/evolution-calendar.desktop.in.in
+src/calendar-server/evolution-calendar.desktop.in
 # Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get it.
 src/gvc/gvc-mixer-control.c
 src/main.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -1,4 +0,0 @@
-data/org.gnome.shell.evolution.calendar.gschema.xml.in
-src/calendar-server/evolution-calendar.desktop.in
-# Meh, autofools :-(
-sub/src/calendar-server/evolution-calendar.desktop.in
--- a/po/as.po
+++ b/po/as.po
@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2014-09-15 14:59+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
-"Language: as_IN\n"
+"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/bn.po
+++ b/po/bn.po
@ -7,6 +7,7 @@ msgstr ""
 "PO-Revision-Date: 2011-04-04 11:04+0600\n"
 "Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2014-12-30 16:45+0000\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: en_US\n"
+"Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@ -14,7 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2014-09-14 23:32+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca-XV\n"
+"Language: ca@valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2014-10-01 15:51+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/ky.po
+++ b/po/ky.po
@ -14,7 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2012-09-24 14:29+0600\n"
 "Last-Translator: Timur Zhamakeev <ztimur@gmail.com>\n"
 "Language-Team: Kirghiz <gnome-i18n@gnome.org>\n"
-"Language: ky_KG\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/mk.po
+++ b/po/mk.po
@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2011-12-08 22:37+0100\n"
 "Last-Translator: Jovan N\n"
 "Language-Team: mk_MK <jovan@lugola.net>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/ms.po
+++ b/po/ms.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2014-09-15 19:21+0730\n"
 "Last-Translator: Umarzuki Mochlis Moktar <umar@umarzuki.org>\n"
 "Language-Team: GNOME Malay Team <gnome-ms@googlegroups.com>\n"
-"Language: \n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/nb.po
+++ b/po/nb.po
@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2016-05-01 14:21+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
-"Language: Norwegian bokmål\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/ug.po
+++ b/po/ug.po
@ -15,7 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2013-03-07 21:01+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
-"Language: \n"
+"Language: ug\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/src/Makefile-calendar-server.am
+++ b/src/Makefile-calendar-server.am
@ -12,7 +12,9 @@ desktopdir=$(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = calendar-server/evolution-calendar.desktop.in

-@INTLTOOL_DESKTOP_RULE@
+%.desktop:%.desktop.in
+	@$(MKDIR_P) $(builddir)/calendar-server
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@

 gnome_shell_calendar_server_CFLAGS =		\
 	-I$(top_srcdir)/src			\
@ -30,6 +32,7 @@ gnome_shell_calendar_server_LDADD =		\
 EXTRA_DIST += 							  \
 	calendar-server/README					  \
 	calendar-server/org.gnome.Shell.CalendarServer.service.in \
+	$(desktop_in_files)					  \
 	$(NULL)

 CLEANFILES += \
--- a/src/calendar-server/evolution-calendar.desktop.in
+++ b/src/calendar-server/evolution-calendar.desktop.in
@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Evolution Calendar
+Exec=evolution -c calendar
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=evolution
+NoDisplay=true
+Type=Application
+StartupNotify=true
--- a/src/calendar-server/evolution-calendar.desktop.in.in
+++ b/src/calendar-server/evolution-calendar.desktop.in.in
@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Calendar
-Exec=evolution -c calendar
-Icon=evolution
-NoDisplay=true
-Type=Application
-StartupNotify=true
--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@ -74,15 +74,15 @@ static App *_global_app = NULL;

 typedef struct
 {
+  char *rid;
  time_t start_time;
  time_t end_time;
 } CalendarOccurrence;

 typedef struct
 {
-  char   *id;
  char   *uid;
-  char   *rid;
+  char   *source_id;
  char   *backend_name;
  char   *summary;
  char   *description;
@ -95,6 +95,12 @@ typedef struct
  GSList *occurrences;
 } CalendarAppointment;

+typedef struct
+{
+  ECalClient *client;
+  GHashTable *appointments;
+} CollectAppointmentsData;
+
 static time_t
 get_time_from_property (icalcomponent         *ical,
                        icalproperty_kind      prop_kind,
@ -129,22 +135,6 @@ get_ical_uid (icalcomponent *ical)
  return g_strdup (icalcomponent_get_uid (ical));
 }

-static char *
-get_ical_rid (icalcomponent *ical)
-{
-  icalproperty        *prop;
-  struct icaltimetype  ical_time;
-
-  prop = icalcomponent_get_first_property (ical, ICAL_RECURRENCEID_PROPERTY);
-  if (!prop)
-    return NULL;
-
-  ical_time = icalproperty_get_recurrenceid (prop);
-
-  return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ?
-    g_strdup (icaltime_as_ical_string (ical_time)) : NULL;
-}
-
 static char *
 get_ical_summary (icalcomponent *ical)
 {
@ -324,12 +314,14 @@ calendar_appointment_equal (CalendarAppointment *a,
      CalendarOccurrence *ob = lb->data;

      if (oa->start_time != ob->start_time ||
-          oa->end_time   != ob->end_time)
+          oa->end_time   != ob->end_time ||
+          null_safe_strcmp (oa->rid, ob->rid) != 0)
        return FALSE;
    }

  return
    null_safe_strcmp (a->uid,          b->uid)          == 0 &&
+    null_safe_strcmp (a->source_id,    b->source_id)    == 0 &&
    null_safe_strcmp (a->backend_name, b->backend_name) == 0 &&
    null_safe_strcmp (a->summary,      b->summary)      == 0 &&
    null_safe_strcmp (a->description,  b->description)  == 0 &&
@ -345,18 +337,15 @@ calendar_appointment_free (CalendarAppointment *appointment)
  GSList *l;

  for (l = appointment->occurrences; l; l = l->next)
-    g_free (l->data);
-  g_slist_free (appointment->occurrences);
+    g_free (((CalendarOccurrence *)l->data)->rid);
+  g_slist_free_full (appointment->occurrences, g_free);
  appointment->occurrences = NULL;

-  g_free (appointment->id);
-  appointment->id = NULL;
-
  g_free (appointment->uid);
  appointment->uid = NULL;

-  g_free (appointment->rid);
-  appointment->rid = NULL;
+  g_free (appointment->source_id);
+  appointment->source_id = NULL;

  g_free (appointment->backend_name);
  appointment->backend_name = NULL;
@ -377,13 +366,16 @@ calendar_appointment_free (CalendarAppointment *appointment)
 static void
 calendar_appointment_init (CalendarAppointment  *appointment,
                           icalcomponent        *ical,
-                           ECalClient           *cal,
-                           icaltimezone         *default_zone)
+                           ECalClient           *cal)
 {
-  const char *source_uid;
+  icaltimezone *default_zone;
+  const char *source_id;
+
+  source_id = e_source_get_uid (e_client_get_source (E_CLIENT (cal)));
+  default_zone = e_cal_client_get_default_timezone (cal);

  appointment->uid          = get_ical_uid (ical);
-  appointment->rid          = get_ical_rid (ical);
+  appointment->source_id    = g_strdup (source_id);
  appointment->backend_name = get_source_backend_name (cal);
  appointment->summary      = get_ical_summary (ical);
  appointment->description  = get_ical_description (ical);
@ -393,16 +385,6 @@ calendar_appointment_init (CalendarAppointment  *appointment,
  appointment->is_all_day   = get_ical_is_all_day (ical,
                                                   appointment->start_time,
                                                   default_zone);
-
-  /* While the UID is usually enough to identify an event, only the triple
-   * of (source,UID,RID) is fully unambiguous; neither may contain '\n',
-   * so we can safely use it to create a unique ID from the triple
-   */
-  source_uid = e_source_get_uid (e_client_get_source (E_CLIENT (cal)));
-  appointment->id = g_strdup_printf ("%s\n%s\n%s",
-                                     source_uid,
-                                     appointment->uid,
-                                     appointment->rid ? appointment->rid : "");
 }

 static icaltimezone *
@ -420,70 +402,52 @@ resolve_timezone_id (const char *tzid,
  return retval;
 }

-static gboolean
-calendar_appointment_collect_occurrence (ECalComponent  *component,
-                                         time_t          occurrence_start,
-                                         time_t          occurrence_end,
-                                         gpointer        data)
-{
-  CalendarOccurrence *occurrence;
-  GSList **collect_loc = data;
-
-  occurrence             = g_new0 (CalendarOccurrence, 1);
-  occurrence->start_time = occurrence_start;
-  occurrence->end_time   = occurrence_end;
-
-  *collect_loc = g_slist_prepend (*collect_loc, occurrence);
-
-  return TRUE;
-}
-
-static void
-calendar_appointment_generate_occurrences (CalendarAppointment *appointment,
-                                           icalcomponent       *ical,
-                                           ECalClient          *cal,
-                                           time_t               start,
-                                           time_t               end,
-                                           icaltimezone        *default_zone)
-{
-  ECalComponent *ecal;
-
-  g_assert (appointment->occurrences == NULL);
-
-  ecal = e_cal_component_new ();
-  e_cal_component_set_icalcomponent (ecal,
-                                     icalcomponent_new_clone (ical));
-
-  e_cal_recur_generate_instances (ecal,
-                                  start,
-                                  end,
-                                  calendar_appointment_collect_occurrence,
-                                  &appointment->occurrences,
-                                  (ECalRecurResolveTimezoneFn) resolve_timezone_id,
-                                  cal,
-                                  default_zone);
-
-  g_object_unref (ecal);
-
-  appointment->occurrences = g_slist_reverse (appointment->occurrences);
-}
-
 static CalendarAppointment *
 calendar_appointment_new (icalcomponent        *ical,
-                          ECalClient           *cal,
-                          icaltimezone         *default_zone)
+                          ECalClient           *cal)
 {
  CalendarAppointment *appointment;

  appointment = g_new0 (CalendarAppointment, 1);

-  calendar_appointment_init (appointment,
-                             ical,
-                             cal,
-                             default_zone);
+  calendar_appointment_init (appointment, ical, cal);
  return appointment;
 }

+static gboolean
+generate_instances_cb (ECalComponent *comp,
+                       time_t         start,
+                       time_t         end,
+                       gpointer       data)
+{
+  ECalClient *cal = ((CollectAppointmentsData *)data)->client;
+  GHashTable *appointments = ((CollectAppointmentsData *)data)->appointments;
+  CalendarAppointment *appointment;
+  CalendarOccurrence *occurrence;
+  const char *uid;
+
+  e_cal_component_get_uid (comp, &uid);
+  appointment = g_hash_table_lookup (appointments, uid);
+
+  if (appointment == NULL)
+    {
+      icalcomponent *ical = e_cal_component_get_icalcomponent (comp);
+
+      appointment = calendar_appointment_new (ical, cal);
+      g_hash_table_insert (appointments, g_strdup (uid), appointment);
+    }
+
+  occurrence             = g_new0 (CalendarOccurrence, 1);
+  occurrence->start_time = start;
+  occurrence->end_time   = end;
+  occurrence->rid        = e_cal_component_get_recurid_as_string (comp);
+
+  appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);
+
+  return TRUE;
+}
+
+
 /* ---------------------------------------------------------------------------------------------------- */

 struct _App
@ -526,6 +490,10 @@ app_update_timezone (App *app)
      app->timezone_location = location;
      print_debug ("Using timezone %s", app->timezone_location);
    }
+  else
+    {
+      g_free (location);
+    }
 }

 static gboolean
@ -619,6 +587,7 @@ app_load_events (App *app)
  GList *ll;
  gchar *since_iso8601;
  gchar *until_iso8601;
+  gchar *query;

  /* out with the old */
  g_hash_table_remove_all (app->appointments);
@ -645,14 +614,19 @@ app_load_events (App *app)
               since_iso8601,
               until_iso8601);

+  query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") "
+                           "(make-time \"%s\")",
+                           since_iso8601,
+                           until_iso8601);
+
  clients = calendar_sources_get_appointment_clients (app->sources);
  for (l = clients; l != NULL; l = l->next)
    {
      ECalClient *cal = E_CAL_CLIENT (l->data);
      GError *error;
-      gchar *query;
      GSList *objects, *j;
      ECalClientView *view;
+      CollectAppointmentsData data;

      e_cal_client_set_default_timezone (cal, app->zone);

@ -666,45 +640,13 @@ app_load_events (App *app)
          continue;
        }

-      query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") "
-                               "(make-time \"%s\")",
-                               since_iso8601,
-                               until_iso8601);
-      error = NULL;
-      objects = NULL;
-      if (!e_cal_client_get_object_list_sync (cal,
-					      query,
-					      &objects,
-					      NULL, /* cancellable */
-					      &error))
-        {
-          ESource *source = e_client_get_source (E_CLIENT (cal));
-          g_warning ("Error querying calendar %s: %s\n",
-		     e_source_get_uid (source), error->message);
-          g_error_free (error);
-          g_free (query);
-          continue;
-        }
-
-      for (j = objects; j != NULL; j = j->next)
-        {
-          icalcomponent *ical = j->data;
-          CalendarAppointment *appointment;
-
-          appointment = calendar_appointment_new (ical, cal, app->zone);
-          if (appointment == NULL)
-            continue;
-
-          calendar_appointment_generate_occurrences (appointment,
-                                                     ical,
-                                                     cal,
-                                                     app->since,
-                                                     app->until,
-                                                     app->zone);
-          g_hash_table_insert (app->appointments, g_strdup (appointment->uid), appointment);
-        }
-
-      e_cal_client_free_icalcomp_slist (objects);
+      data.client = cal;
+      data.appointments = app->appointments;
+      e_cal_client_generate_instances_sync (cal,
+                                            app->since,
+                                            app->until,
+                                            generate_instances_cb,
+                                            &data);

      error = NULL;
      if (!e_cal_client_get_view_sync (cal,
@ -733,12 +675,11 @@ app_load_events (App *app)
          e_cal_client_view_start (view, NULL);
          app->live_views = g_list_prepend (app->live_views, view);
        }
-
-      g_free (query);
    }
  g_list_free (clients);
  g_free (since_iso8601);
  g_free (until_iso8601);
+  g_free (query);
  app->cache_invalid = FALSE;
 }

@ -929,16 +870,27 @@ handle_method_call (GDBusConnection       *connection,
                  (start_time <= app->since &&
                  (end_time - 1) > app->since))
                {
+                  /* While the UID is usually enough to identify an event,
+                   * only the triple of (source,UID,RID) is fully unambiguous;
+                   * neither may contain '\n', so we can safely use it to
+                   * create a unique ID from the triple
+                   */
+                  char *id = g_strdup_printf ("%s\n%s\n%s",
+                                              a->source_id,
+                                              a->uid,
+                                              o->rid ? o->rid : "");
+
                  g_variant_builder_init (&extras_builder, G_VARIANT_TYPE ("a{sv}"));
                  g_variant_builder_add (&builder,
                                         "(sssbxxa{sv})",
-                                         a->id,
+                                         id,
                                         a->summary != NULL ? a->summary : "",
                                         a->description != NULL ? a->description : "",
                                         (gboolean) a->is_all_day,
                                         (gint64) start_time,
                                         (gint64) end_time,
                                         extras_builder);
+                  g_free (id);
                }
            }
        }
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@ -59,6 +59,8 @@ main(int argc, char **argv)
  gsize len;
  int code;

+  gdk_set_allowed_backends("x11");
+
  gtk_init (&argc, &argv);

  clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
@ -66,6 +68,9 @@ main(int argc, char **argv)
  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
    return 1;

+  g_object_set (clutter_settings_get_default (), "window-scaling-factor", 1, NULL);
+  gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
+
  context = g_option_context_new (NULL);

  /* pass unknown through to the JS script */
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -96,7 +96,8 @@ enum {
  PROP_ID,
  PROP_DBUS_ID,
  PROP_ACTION_GROUP,
-  PROP_MENU
+  PROP_MENU,
+  PROP_APP_INFO
 };

 enum {
@ -138,6 +139,29 @@ shell_app_get_property (GObject    *gobject,
      if (app->running_state)
        g_value_set_object (value, app->running_state->remote_menu);
      break;
+    case PROP_APP_INFO:
+      if (app->info)
+        g_value_set_object (value, app->info);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+shell_app_set_property (GObject      *gobject,
+                        guint         prop_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  ShellApp *app = SHELL_APP (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_APP_INFO:
+      _shell_app_set_app_info (app, g_value_get_object (value));
+      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
@ -806,9 +830,9 @@ _shell_app_new (GDesktopAppInfo *info)
 {
  ShellApp *app;

-  app = g_object_new (SHELL_TYPE_APP, NULL);
-
-  _shell_app_set_app_info (app, info);
+  app = g_object_new (SHELL_TYPE_APP,
+                      "app-info", info,
+                      NULL);

  return app;
 }
@ -817,12 +841,11 @@ void
 _shell_app_set_app_info (ShellApp        *app,
                         GDesktopAppInfo *info)
 {
-  g_clear_object (&app->info);
-  app->info = g_object_ref (info);
+  g_set_object (&app->info, info);

-  if (app->name_collation_key != NULL)
-    g_free (app->name_collation_key);
-  app->name_collation_key = g_utf8_collate_key (shell_app_get_name (app), -1);
+  g_clear_pointer (&app->name_collation_key, g_free);
+  if (app->info)
+    app->name_collation_key = g_utf8_collate_key (shell_app_get_name (app), -1);
 }

 static void
@ -1405,6 +1428,7 @@ shell_app_class_init(ShellAppClass *klass)
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

  gobject_class->get_property = shell_app_get_property;
+  gobject_class->set_property = shell_app_set_property;
  gobject_class->dispose = shell_app_dispose;
  gobject_class->finalize = shell_app_finalize;

@ -1483,5 +1507,17 @@ shell_app_class_init(ShellAppClass *klass)
                                                        "The primary menu exported by the remote application",
                                                        G_TYPE_MENU_MODEL,
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+  /**
+   * ShellApp:app-info:
+   *
+   * The #GDesktopAppInfo associated with this ShellApp, if any.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_APP_INFO,
+                                   g_param_spec_object ("app-info",
+                                                        "DesktopAppInfo",
+                                                        "The DesktopAppInfo associated with this app",
+                                                        G_TYPE_DESKTOP_APP_INFO,
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));

 }
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -1583,7 +1583,7 @@ shell_global_get_current_time (ShellGlobal *global)
 */
 GAppLaunchContext *
 shell_global_create_app_launch_context (ShellGlobal *global,
-                                        int          timestamp,
+                                        guint32      timestamp,
                                        int          workspace)
 {
  GdkAppLaunchContext *context;
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -71,7 +71,7 @@ void     shell_global_sync_pointer              (ShellGlobal  *global);

 GAppLaunchContext *
         shell_global_create_app_launch_context (ShellGlobal  *global,
-                                                 int           timestamp,
+                                                 guint32       timestamp,
                                                 int           workspace);

 void     shell_global_play_theme_sound          (ShellGlobal *global,
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -22,6 +22,7 @@
 #include "shell-global.h"
 #include "shell-recorder-src.h"
 #include "shell-recorder.h"
+#include "shell-util.h"

 #define A11Y_APPS_SCHEMA "org.gnome.desktop.a11y.applications"
 #define MAGNIFIER_ACTIVE_KEY "screen-magnifier-enabled"
@ -107,6 +108,8 @@ static void recorder_set_draw_cursor (ShellRecorder *recorder,
 static void recorder_pipeline_set_caps (RecorderPipeline *pipeline);
 static void recorder_pipeline_closed   (RecorderPipeline *pipeline);

+static void recorder_remove_redraw_timeout (ShellRecorder *recorder);
+
 enum {
  PROP_0,
  PROP_SCREEN,
@ -235,6 +238,8 @@ shell_recorder_finalize (GObject  *object)
  recorder_set_pipeline (recorder, NULL);
  recorder_set_file_template (recorder, NULL);

+  recorder_remove_redraw_timeout (recorder);
+
  g_clear_object (&recorder->a11y_settings);

  G_OBJECT_CLASS (shell_recorder_parent_class)->finalize (object);
@ -317,6 +322,9 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
  guint8 *data;

  texture = meta_cursor_tracker_get_sprite (recorder->cursor_tracker);
+  if (!texture)
+    return;
+
  width = cogl_texture_get_width (texture);
  height = cogl_texture_get_height (texture);
  stride = 4 * width;
@ -382,11 +390,17 @@ recorder_draw_cursor (ShellRecorder *recorder,
 /* Retrieve a frame and feed it into the pipeline
 */
 static void
-recorder_record_frame (ShellRecorder *recorder)
+recorder_record_frame (ShellRecorder *recorder,
+                       gboolean       paint)
 {
  GstBuffer *buffer;
-  guint8 *data;
+  ClutterCapture *captures;
+  int n_captures;
+  cairo_surface_t *image;
  guint size;
+  uint8_t *data;
+  GstMemory *memory;
+  int i;
  GstClock *clock;
  GstClockTime now, base_time;

@ -418,21 +432,35 @@ recorder_record_frame (ShellRecorder *recorder)
    return;
  recorder->last_frame_time = now;

-  size = recorder->area.width * recorder->area.height * 4;
+  clutter_stage_capture (recorder->stage, paint, &recorder->area,
+                         &captures, &n_captures);

-  data = g_malloc (size);
-  cogl_framebuffer_read_pixels (cogl_get_draw_framebuffer (),
-                                recorder->area.x,
-                                recorder->area.y,
-                                recorder->area.width,
-                                recorder->area.height,
-                                CLUTTER_CAIRO_FORMAT_ARGB32,
-                                data);
+  if (n_captures == 0)
+    return;
+
+  if (n_captures == 1)
+    image = cairo_surface_reference (captures[0].image);
+  else
+    image = shell_util_composite_capture_images (captures,
+                                                 n_captures,
+                                                 recorder->area.x,
+                                                 recorder->area.y,
+                                                 recorder->area.width,
+                                                 recorder->area.height);
+
+  data = cairo_image_surface_get_data (image);
+  size = (cairo_image_surface_get_height (image) *
+          cairo_image_surface_get_stride (image));
+
+  for (i = 0; i < n_captures; i++)
+    cairo_surface_destroy (captures[i].image);
+  g_free (captures);

  buffer = gst_buffer_new();
-  gst_buffer_insert_memory (buffer, -1,
-                            gst_memory_new_wrapped (0, data, size, 0,
-                                                    size, data, g_free));
+  memory = gst_memory_new_wrapped (0, data, size, 0, size,
+                                   image,
+                                   (GDestroyNotify) cairo_surface_destroy);
+  gst_buffer_insert_memory (buffer, -1, memory);

  GST_BUFFER_PTS(buffer) = now;

@ -456,7 +484,7 @@ recorder_on_stage_paint (ClutterActor  *actor,
                         ShellRecorder *recorder)
 {
  if (recorder->state == RECORDER_STATE_RECORDING)
-    recorder_record_frame (recorder);
+    recorder_record_frame (recorder, FALSE);
 }

 static void
@ -1052,7 +1080,7 @@ recorder_open_outfile (ShellRecorder  *recorder,

      if (outfile == -1 && errno != EEXIST)
        {
-          g_warning ("Cannot open output file '%s': %s", filename->str, g_strerror (errno));
+          g_warning ("Cannot open output file '%s': %s", path, g_strerror (errno));
          g_string_free (filename, TRUE);
          g_free (path);
          goto out;
@ -1554,7 +1582,7 @@ shell_recorder_close (ShellRecorder *recorder)
  /* We want to record one more frame since some time may have
   * elapsed since the last frame
   */
-  clutter_actor_paint (CLUTTER_ACTOR (recorder->stage));
+  recorder_record_frame (recorder, TRUE);

  recorder_remove_update_pointer_timeout (recorder);
  recorder_close_pipeline (recorder);
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@ -10,6 +10,7 @@

 #include "shell-global.h"
 #include "shell-screenshot.h"
+#include "shell-util.h"

 #define A11Y_APPS_SCHEMA "org.gnome.desktop.a11y.applications"
 #define MAGNIFIER_ACTIVE_KEY "screen-magnifier-enabled"
@ -210,41 +211,41 @@ write_screenshot_thread (GTask        *result,

 static void
 do_grab_screenshot (ShellScreenshot *screenshot,
+                    ClutterStage    *stage,
                    int               x,
                    int               y,
                    int               width,
                    int               height)
 {
-  CoglBitmap *bitmap;
-  ClutterBackend *backend;
-  CoglContext *context;
-  int stride;
-  guchar *data;
  ShellScreenshotPrivate *priv = screenshot->priv;
+  ClutterCapture *captures;
+  int n_captures;
+  int i;

-  backend = clutter_get_default_backend ();
-  context = clutter_backend_get_cogl_context (backend);
+  clutter_stage_capture (stage, FALSE,
+                         &(cairo_rectangle_int_t) {
+                           .x = x,
+                           .y = y,
+                           .width = width,
+                           .height = height
+                         },
+                         &captures,
+                         &n_captures);

-  priv->image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                            width, height);
+  if (n_captures == 0)
+    return;
+  else if (n_captures == 1)
+    priv->image = cairo_surface_reference (captures[0].image);
+  else
+    priv->image = shell_util_composite_capture_images (captures,
+                                                       n_captures,
+                                                       x, y,
+                                                       width, height);

+  for (i = 0; i < n_captures; i++)
+    cairo_surface_destroy (captures[i].image);

-  data = cairo_image_surface_get_data (priv->image);
-  stride = cairo_image_surface_get_stride (priv->image);
-
-  bitmap = cogl_bitmap_new_for_data (context,
-                                     width,
-                                     height,
-                                     CLUTTER_CAIRO_FORMAT_ARGB32,
-                                     stride,
-                                     data);
-  cogl_framebuffer_read_pixels_into_bitmap (cogl_get_draw_framebuffer (),
-                                            x, y,
-                                            COGL_READ_PIXELS_COLOR_BUFFER,
-                                            bitmap);
-
-  cairo_surface_mark_dirty (priv->image);
-  cogl_object_unref (bitmap);
+  g_free (captures);
 }

 static void
@ -312,7 +313,7 @@ grab_screenshot (ClutterActor *stage,
  screen = shell_global_get_screen (priv->global);
  meta_screen_get_size (screen, &width, &height);

-  do_grab_screenshot (screenshot, 0, 0, width, height);
+  do_grab_screenshot (screenshot, CLUTTER_STAGE (stage), 0, 0, width, height);

  if (meta_screen_get_n_monitors (screen) > 1)
    {
@ -381,6 +382,7 @@ grab_area_screenshot (ClutterActor *stage,
  ShellScreenshotPrivate *priv = screenshot->priv;

  do_grab_screenshot (screenshot,
+                      CLUTTER_STAGE (stage),
                      priv->screenshot_area.x,
                      priv->screenshot_area.y,
                      priv->screenshot_area.width,
--- a/src/shell-tray-icon.c
+++ b/src/shell-tray-icon.c
@ -204,6 +204,12 @@ shell_tray_icon_click (ShellTrayIcon *icon,
  gdk_error_trap_push ();

  remote_window = gtk_socket_get_plug_window (GTK_SOCKET (icon->priv->socket));
+  if (remote_window == NULL)
+    {
+      g_warning ("shell tray: plug window is gone");
+      gdk_error_trap_pop_ignored ();
+      return;
+    }
  xwindow = GDK_WINDOW_XID (remote_window);
  xdisplay = GDK_WINDOW_XDISPLAY (remote_window);
  screen = gdk_window_get_screen (remote_window);
--- a/src/shell-util.c
+++ b/src/shell-util.c
@ -393,18 +393,6 @@ shell_util_need_background_refresh (void)
  return FALSE;
 }

-void
-shell_util_text_insert_keyval (ClutterActor *actor,
-                               guint         keyval)
-{
-  ClutterEvent event = { 0 };
-
-  event.type = CLUTTER_KEY_PRESS;
-  event.key.keyval = keyval;
-
-  clutter_actor_event (actor, &event, FALSE);
-}
-
 static gboolean
 canvas_draw_cb (ClutterContent *content,
                cairo_t        *cr,
@ -458,3 +446,49 @@ shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,

  return content;
 }
+
+cairo_surface_t *
+shell_util_composite_capture_images (ClutterCapture  *captures,
+                                     int              n_captures,
+                                     int              x,
+                                     int              y,
+                                     int              width,
+                                     int              height)
+{
+  int i;
+  cairo_format_t format;
+  cairo_surface_t *image;
+  cairo_t *cr;
+
+  format = cairo_image_surface_get_format (captures[0].image);
+  image = cairo_image_surface_create (format, width, height);
+
+  cr = cairo_create (image);
+
+  for (i = 0; i < n_captures; i++)
+    {
+      ClutterCapture *capture = &captures[i];
+      double capture_scale = 1.0;
+
+      /*
+       * Ignore capture regions with scale other than 1 for now; mutter can't
+       * produce them yet, so there is no way to test them.
+       */
+      cairo_surface_get_device_scale (capture->image, &capture_scale, NULL);
+      if ((int) capture_scale != 1)
+        continue;
+
+      cairo_save (cr);
+
+      cairo_translate (cr,
+                       capture->rect.x - x,
+                       capture->rect.y - y);
+      cairo_set_source_surface (cr, capture->image, 0, 0);
+      cairo_paint (cr);
+
+      cairo_restore (cr);
+    }
+  cairo_destroy (cr);
+
+  return image;
+}
--- a/src/shell-util.h
+++ b/src/shell-util.h
@ -48,12 +48,16 @@ void    shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,

 gboolean shell_util_need_background_refresh (void);

-void shell_util_text_insert_keyval (ClutterActor *actor,
-                                    guint         keyval);
-
 ClutterContent * shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
                                                          MetaRectangle   *window_rect);

+cairo_surface_t * shell_util_composite_capture_images (ClutterCapture  *captures,
+                                                       int              n_captures,
+                                                       int              x,
+                                                       int              y,
+                                                       int              width,
+                                                       int              height);
+
 G_END_DECLS

 #endif /* __SHELL_UTIL_H__ */
--- a/src/st/st-shadow.c
+++ b/src/st/st-shadow.c
@ -287,13 +287,8 @@ st_shadow_helper_paint (StShadowHelper  *helper,
                        ClutterActorBox *actor_box,
                        guint8           paint_opacity)
 {
-  ClutterActorBox allocation;
-  float width, height;
-
-  clutter_actor_box_get_size (actor_box, &width, &height);
-
  _st_paint_shadow_with_opacity (helper->shadow,
                                 helper->pipeline,
-                                 &allocation,
+                                 actor_box,
                                 paint_opacity);
 }