WIP: Implement the primary selection protocol

2016-02-20 01:37:01 +01:00
31 changed files with 3447 additions and 1657 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -62,8 +62,6 @@ src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
-src/gtk-primary-selection-protocol.c
-src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
 src/xdg-shell-unstable-v*-protocol.c
--- a/28
+++ b/28
@@ -1,31 +1,3 @@
-3.19.91
-=======
-* Add --nested CLI argument to fix nested wayland session [Jonas; #758658]
-* Fix stack - scene graph stacking synchronization issues [Jonas; #755605]
-* Rate-limit last-device changes to fix freezes [Carlos; #753527]
-* Implement primary selection protocol [Carlos; #762560]
-* Misc. bug fixes [Carlos, Jonas; #762878, #762716]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Tim Lunn
-
-Translations:
-  Piotr Drąg [pl], Artur de Aquino Morais [pt_BR], Marek Černocký [cs],
-  Cédric Valmary [oc], Mario Blättermann [de], Dušan Kazik [sk],
-  Fran Dieguez [gl], Aurimas Černius [lt], Daniel Mustieles [es],
-  Stas Solovey [ru], Yosef Or Boczko [he]
-
-3.19.90
-=======
-* Release buffer after processing commit [Ray; #761312, #761613]
-* Implement pointer motion, locks and confinement on wayland [Jonas; #744104]
-* Add basic startup notification support on wayland [Carlos; #762268]
-* Misc. bug fixes [Rui, Alberts, Florian; #760670, #761543, #752794, #761557]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Florian Müllner, Jasper St. Pierre, Ray Strode
-
 3.19.4
 ======
 * Fix updating stacking order when setting transient_for [Jonas; #755606]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [19])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_micro_version], [4])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -64,7 +64,7 @@ MUTTER_PC_MODULES="
   pango >= 1.2.0
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.19.3
-   $CLUTTER_PACKAGE >= 1.25.6
+   $CLUTTER_PACKAGE >= 1.25.1
   cogl-1.0 >= 1.17.1
   upower-glib >= 0.99.0
   gnome-desktop-3.0
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-27 13:36+0000\n"
+"POT-Creation-Date: 2015-03-24 23:25+0000\n"
 "PO-Revision-Date: 2014-09-22 15:01+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
@@ -238,7 +238,8 @@ msgstr "Přepnout okno na všechny/jednu pracovní plochu"

 #: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
-msgstr "Když je okno zakryté vynést jej do popředí, jinak odsunout do pozadí"
+msgstr ""
+"Když je okno zakryté vynést jej do popředí, jinak odsunout do pozadí"

 #: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
@@ -456,22 +457,22 @@ msgstr "Přepnout na VT 11"
 msgid "Switch to VT 12"
 msgstr "Přepnout na VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Vestavěný displej"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Neznámý"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Neznámý displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -514,44 +515,40 @@ msgstr "_Počkat"
 msgid "_Force Quit"
 msgstr "_Vynutit ukončení"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nelze otevřít displej X Window System „%s“\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Zakáže připojení ke správci sezení"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Nahradí běžícího správce oken"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Určení ID správy sezení"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Displej X, který použije"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Spustí sezení z uloženého souboru"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Provede volání X synchronně"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
-msgstr "Spustit jako kompozitor protokolu Wayland"
+msgstr "Spustit jako kompozitní program protokolu Wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Spustit jako podkladový kompozitor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"

@@ -579,12 +576,12 @@ msgstr "Vypíše verzi"
 msgid "Mutter plugin to use"
 msgstr "Zásuvný modul Mutter, který se má použít"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Plocha %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -593,12 +590,12 @@ msgstr ""
 "Displej „%s“ již správce oken má; zkuste prosím nahradit aktuálního správce "
 "oken pomocí přepínače --replace."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"

@@ -1275,3 +1272,32 @@ msgstr "%s (na %s)"
 #~ msgid "Move to Another _Workspace"
 #~ msgstr "Přes_unout na jinou plochu"

+#~ msgid "Shift"
+#~ msgstr "Shift"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "Alt"
+#~ msgstr "Alt"
+
+#~ msgid "Meta"
+#~ msgstr "Meta"
+
+#~ msgid "Super"
+#~ msgstr "Super"
+
+#~ msgid "Hyper"
+#~ msgstr "Hyper"
+
+#~ msgid "Mod2"
+#~ msgstr "Mod2"
+
+#~ msgid "Mod3"
+#~ msgstr "Mod3"
+
+#~ msgid "Mod4"
+#~ msgstr "Mod4"
+
+#~ msgid "Mod5"
+#~ msgstr "Mod5"
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
 # Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-28 13:37+0000\n"
-"PO-Revision-Date: 2016-02-28 19:15+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2015-06-20 08:08+0000\n"
+"PO-Revision-Date: 2015-06-18 20:59+0100\n"
+"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.1\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -463,22 +463,22 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Unbekannt"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Unbekannte Anzeige"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -523,44 +523,40 @@ msgstr "_Warten"
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:563
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Als eingebetteten Compositor ausführen"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"

@@ -590,12 +586,12 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -604,12 +600,12 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"

--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2002,2003.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-28 13:37+0000\n"
-"PO-Revision-Date: 2016-02-29 16:02+0100\n"
+"POT-Creation-Date: 2015-02-23 11:10+0000\n"
+"PO-Revision-Date: 2015-02-23 19:07+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -445,41 +445,46 @@ msgid "Switch to VT 7"
 msgstr "Cambiar al VT 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Cambiar al VT 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Cambiar al VT 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Cambiar al VT 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Cambiar al VT 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Cambiar al VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Pantalla integrada"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Desconocida"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -524,45 +529,40 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forzar la salida"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Reemplazar el gestor de ventanas en ejecución"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar el ID se gestión de sesión"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Pantalla X que usar"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde el archivo de salvaguarda"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Hacer que las llamadas a las X sean síncronas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Ejecutar como compositor Wayland"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Ejecutar como compositor anidado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Ejecutar como servidor completo, en lugar de anidado"

@@ -589,12 +589,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Complemento de mutter que usar"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -603,12 +603,12 @@ msgstr ""
 "La pantalla «%s» ya tiene un gestor de ventanas; pruebe a usar la opción «--"
 "replace» para reemplazar el gestor de ventanas activo."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter fue compilado sin soporte para modo prolijo\n"

--- a/po/gl.po
+++ b/po/gl.po
@@ -9,21 +9,22 @@
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015, 2016.
+# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-02 09:49+0100\n"
-"PO-Revision-Date: 2016-03-02 09:49+0200\n"
+"POT-Creation-Date: 2015-02-28 22:43+0100\n"
+"PO-Revision-Date: 2015-02-28 22:42+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: gnome-l10n-gl@gnome.org\n"
+"Language-Team: Galician <>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -460,22 +461,22 @@ msgstr "Cambiar á VT 11"
 msgid "Switch to VT 12"
 msgstr "Cambiar á VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Pantalla embebida"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Descoñecido"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Pantalla descoñecida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -520,44 +521,40 @@ msgstr "Espe_rar"
 msgid "_Force Quit"
 msgstr "_Forzar a saída"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desactivar a conexión ao xestor de sesión"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituír o xestor de xanelas en execución"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID de xestión de sesión"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Pantalla X que se vai usar"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde o ficheiro de salvagarda"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan sincrónicas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como compositor de wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Executar como compositor anidado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado"

@@ -584,12 +581,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Engadido de mutter que usar"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -598,12 +595,12 @@ msgstr ""
 "A pantalla «%s» ten xa un xestor de xanelas, tente usar a opción --replace "
 "para substituír o xestor de xanelas."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n"

--- a/po/he.po
+++ b/po/he.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-03 14:39+0200\n"
-"PO-Revision-Date: 2016-03-03 14:40+0200\n"
+"POT-Creation-Date: 2015-02-24 19:33+0200\n"
+"PO-Revision-Date: 2015-02-24 19:34+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
 "Language: he\n"
@@ -453,22 +453,22 @@ msgstr "מעבר ל־VT ‏11"
 msgid "Switch to VT 12"
 msgstr "מעבר ל־VT ‏12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "תצוגה מובנית"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "לא ידוע"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "תצוגה לא ידועה"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -510,44 +510,40 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Replace the running window manager"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Specify session management ID"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X Display to use"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initialize session from savefile"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Make X calls synchronous"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Run as a wayland compositor"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Run as a nested compositor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Run as a full display server, rather than nested"

@@ -573,12 +569,12 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "מרחב עבודה %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -587,12 +583,12 @@ msgstr ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Screen %d on display '%s' is invalid\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter הודר ללא תמיכה במצב פירוט\n"

--- a/po/lt.po
+++ b/po/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-26 09:54+0000\n"
-"PO-Revision-Date: 2016-02-25 15:18+0200\n"
+"POT-Creation-Date: 2016-01-05 13:43+0000\n"
+"PO-Revision-Date: 2016-01-05 18:04+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -513,46 +513,42 @@ msgstr "_Laukti"
 msgid "_Force Quit"
 msgstr "_Priverstinai išeiti"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:563
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepavyko atverti X Window sistemos ekrano „%s“\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:180
 msgid "Disable connection to session manager"
 msgstr "Išjungti susijungimą su sesijos tvarkytuve"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:186
 msgid "Replace the running window manager"
 msgstr "Pakeisti veikiančią langų tvarkytuvę"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:192
 msgid "Specify session management ID"
 msgstr "Nurodyti sesijos tvarkymo ID"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:197
 msgid "X Display to use"
 msgstr "Naudotinas X ekranas"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:203
 msgid "Initialize session from savefile"
 msgstr "Inicializuoti sesiją iš išsaugojimo failo"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:209
 msgid "Make X calls synchronous"
 msgstr "Sinchronizuoti X iškvietimus"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:216
 msgid "Run as a wayland compositor"
 msgstr "Vykdyti kaip wayland kompozitorių"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Vykdyti kaip įdėtinį kompozitorių"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:224
 msgid "Run as a full display server, rather than nested"
-msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne įdėtinį"
+msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne vidinį"

 #: ../src/core/mutter.c:39
 #, c-format
@@ -584,7 +580,7 @@ msgstr "Naudojamas Mutter įskiepis"
 msgid "Workspace %d"
 msgstr "Darbo sritis %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:526
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -593,12 +589,12 @@ msgstr ""
 "Vaizduoklis „%s“ jau turi langų tvarkytuvę; pabandykite pakeisti esamą langų "
 "tvarkytuvę, naudodami parametrą --replace."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:608
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ netinkamas\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"

--- a/po/oc.po
+++ b/po/oc.po
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@
 # Marek Stępień <marcoos@aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2016.
-# Aviary.pl <gnomepl@aviary.pl>, 2007-2016.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2015.
+# Aviary.pl <gnomepl@aviary.pl>, 2007-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 17:29+0100\n"
-"PO-Revision-Date: 2016-02-25 17:30+0100\n"
+"POT-Creation-Date: 2015-08-26 18:49+0200\n"
+"PO-Revision-Date: 2015-08-26 18:50+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -285,10 +285,10 @@ msgid ""
 "\"Windows key\" on PC hardware. It's expected that this binding either the "
 "default or set to the empty string."
 msgstr ""
-"Ten klawisz inicjuje tryb „overlay” (nakładki), który jest połączeniem "
-"podglądu okien i systemu uruchamiania programów. Domyślnie jest przeznaczony "
-"do powiązania z klawiszem „Windows” na komputerach typu PC. Ustawienie tego "
-"powiązania powinno być domyślne lub puste."
+"Ten klawisz inicjuje tryb „overlay”, który jest połączeniem podglądu okien i "
+"systemu uruchamiania programów. Domyślnie jest przeznaczony do powiązania z "
+"klawiszem „Windows” na komputerach typu PC. Ustawienie tego powiązania "
+"powinno być domyślne lub puste."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
@@ -332,8 +332,8 @@ msgid ""
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Określa, czy obszary robocze są zarządzane dynamicznie, czy istnieje "
-"statyczna liczba obszarów (określona przez klucz „num-workspaces” w „org."
-"gnome.desktop.wm.preferences”)."
+"statyczna liczba obszarów (określona przez klucz „num-workspaces” w org."
+"gnome.desktop.wm.preferences)."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@@ -468,22 +468,22 @@ msgstr "Przełączenie na 11. konsolę wirtualną"
 msgid "Switch to VT 12"
 msgstr "Przełączenie na 12. konsolę wirtualną"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:500
 msgid "Built-in display"
 msgstr "Wbudowany ekran"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:526
 msgid "Unknown"
 msgstr "Nieznany"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:528
 msgid "Unknown Display"
 msgstr "Nieznany ekran"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:536
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -525,46 +525,42 @@ msgstr "_Czekaj"
 msgid "_Force Quit"
 msgstr "_Zakończ"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:563
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Rozłącza połączenie z menedżerem sesji"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Używany ekran X"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicjuje sesję z zapisanego pliku"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Uruchamia jako menedżer składania Wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Uruchamia jako osadzony menedżer składania"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
-msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
+msgstr "Uruchamia pełny serwer wyświetlania zamiast osadzonego"

 #: ../src/core/mutter.c:39
 #, c-format
@@ -576,7 +572,7 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., oraz inni\n"
+"Copyright (C) 2001—%d Havoc Pennington, Red Hat, Inc., oraz inni\n"
 "Niniejszy program jest wolnym oprogramowaniem, aby poznać warunki, pod\n"
 "jakimi dopuszczalne jest kopiowanie programu, zajrzyj do jego źródeł.\n"
 "Na program nie udziela się ŻADNYCH GWARANCJI, nawet domyślnej gwarancji\n"
@@ -588,23 +584,23 @@ msgstr "Wyświetla wersję"

 #: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
-msgstr "Używana wtyczka menedżera Mutter"
+msgstr "Używana wtyczka programu Mutter"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
-msgstr "%d. obszar roboczy"
+msgstr "Obszar roboczy %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."
 msgstr ""
 "Na ekranie „%s” działa już menedżer okien. Aby zastąpić działającego "
-"menedżera okien, należy użyć opcji „--replace”."
+"menedżera okien, proszę spróbować użyć opcji --replace."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
@@ -612,7 +608,7 @@ msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
 #: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
-"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
+"Program Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"

 #: ../src/x11/session.c:1815
 msgid ""
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,23 +15,22 @@
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
 # Enrico Nicoletto <liverig@gmail.com>, 2012, 2014.
-# Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-25 13:40+0000\n"
-"PO-Revision-Date: 2016-02-25 13:41-0300\n"
-"Last-Translator: Artur de Aquino Morais <artur.morais93@outlook.com>\n"
+"POT-Creation-Date: 2015-02-26 11:24+0000\n"
+"PO-Revision-Date: 2015-02-26 17:36-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -473,22 +472,22 @@ msgstr "Trocar para o VT 11"
 msgid "Switch to VT 12"
 msgstr "Trocar para o VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Tela embutida"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Desconhecido"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Monitor desconhecido"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s de %s"
@@ -532,44 +531,40 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forçar sair"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir a exibição \"%s\" do sistema de janelas X\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desabilitar a conexão com o gerenciador de sessões"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituir o gerenciador de janelas em execução"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID do gerenciador de sessões"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Exibição do X a ser utilizada"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar a sessão a partir do arquivo salvo"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Fazer X chamadas síncronas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como um compositor wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Executar como um compositor aninhado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"

@@ -597,12 +592,12 @@ msgstr "Versão impressa"
 msgid "Mutter plugin to use"
 msgstr "Plug-in do Mutter para usar"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -611,7 +606,7 @@ msgstr ""
 "A exibição \"%s\" já possui um gerenciador de janelas; tente usar a opção --"
 "replace para substituir o gerenciador de janelas atual."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A tela %d na exibição \"%s\" é inválida\n"
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,16 +9,15 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2011.
 # Yuri Myasoedov <ymyasoedov@yandex.ru>, 2012-2014, 2015.
 # Ivan Komaritsyn <vantu5z@mail.ru>, 2015.
-# Stas Solovey <whats_up@tut.by>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-03 01:44+0000\n"
-"PO-Revision-Date: 2016-03-03 13:51+0300\n"
-"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+"POT-Creation-Date: 2015-02-19 23:11+0000\n"
+"PO-Revision-Date: 2015-02-20 13:59+0300\n"
+"Last-Translator: Ivan Komaritsyn <vantu5z@mail.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -442,41 +441,46 @@ msgid "Switch to VT 7"
 msgstr "Переключиться на виртуальный терминал 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Переключиться на виртуальный терминал 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Переключиться на виртуальный терминал 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Переключиться на виртуальный терминал 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Переключиться на виртуальный терминал 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Переключиться на виртуальный терминал 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Встроенный дисплей"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Неизвестный"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Неизвестный дисплей"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -517,45 +521,40 @@ msgstr "_Подождать"
 msgid "_Force Quit"
 msgstr "Завер_шить"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не удалось открыть дисплей «%s» системы X Window\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Запретить подключение к менеджеру сеансов"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Заменить запущенный оконный менеджер"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Указать идентификатор управления сеансом"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Используемый дисплей X"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Инициализировать сеанс из сохранённого файла"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Сделать X-вызовы синхронными"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Запустить в качестве композитора wayland"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Запустить в качестве встроенного композитора"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Запустить в качестве полноэкранного сервера вместо встроенного"

@@ -584,12 +583,12 @@ msgstr "Вывести версию"
 msgid "Mutter plugin to use"
 msgstr "Использовать модуль mutter"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -598,12 +597,12 @@ msgstr ""
 "Дисплей «%s» уже использует менеджер окон; попробуйте использовать параметр "
 "--replace, чтобы заменить текущий менеджер окон."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Недопустимый экран %d дисплея «%s»\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter собран без поддержки режима подробных сообщений\n"

--- a/po/sk.po
+++ b/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-01 13:42+0000\n"
-"PO-Revision-Date: 2016-03-01 20:40+0100\n"
+"POT-Creation-Date: 2015-02-21 23:27+0000\n"
+"PO-Revision-Date: 2015-02-22 11:11+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -542,22 +542,22 @@ msgstr "Prepnúť na VT č. 11"
 msgid "Switch to VT 12"
 msgstr "Prepnúť na VT č. 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Vstavaný displej"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Neznámy"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Neznámy displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -602,51 +602,46 @@ msgid "_Force Quit"
 msgstr "_Vynútiť ukončenie"

 # X window system preloz, napr. system na spravu okien X
-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Zlyhalo otvorenie displeja systému na správu okien X „%s“\n"

 # cmd desc
-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Zakáže pripojenia k správcovi relácií"

 # cmd desc
-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Nahradí bežiaceho správcu okien"

 # cmd desc
-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Zadá identifikátor správy relácií"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X displej, ktorý bude použitý"

 # cmd desc
-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializuje reláciu z uloženého súboru"

 # cmd desc
-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Použije synchrónne volania X"

 # cmd desc
-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Spustí ako kompozitor protokolu wayland"

-# cmd desc
-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Spustí ako kompozitor s vnoreným režimom"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustí ako plnohodnotný zobrazovací server, namiesto vnoreného režimu"

@@ -675,12 +670,12 @@ msgstr "Zobrazí verziu"
 msgid "Mutter plugin to use"
 msgstr "Použije zásuvný modul Mutter"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovný priestor č. %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -689,12 +684,12 @@ msgstr ""
 "Displej „%s“ už má správcu okien. Skúste použiť prepínač --replace, aby sa "
 "aktuálny správca nahradil."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka č. %d na displeji „%s“ nie je platná\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n"

--- a/src/Makefile-tests.am
+++ b/src/Makefile-tests.am
@@ -19,9 +19,9 @@ installedtestsdir = $(datadir)/installed-tests/mutter
 installedtests_DATA = mutter-all.test

 installedtestsbindir = $(libexecdir)/installed-tests/mutter
-installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner mutter-test-unit-tests
+installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner
 else
-noinst_PROGRAMS += mutter-test-client mutter-test-runner mutter-test-unit-tests
+noinst_PROGRAMS += mutter-test-client mutter-test-runner
 endif

 EXTRA_DIST += tests/mutter-all.test.in
@@ -32,19 +32,11 @@ mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
 mutter_test_runner_SOURCES = tests/test-runner.c
 mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la

-mutter_test_unit_tests_SOURCES = tests/unit-tests.c
-mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter.la
+.PHONY: run-tests

-.PHONY: run-tests run-test-runner-tests run-unit-tests
-
-run-test-runner-tests: mutter-test-client mutter-test-runner
+run-tests: mutter-test-client mutter-test-runner
 	./mutter-test-runner $(dist_stacking_DATA)

-run-unit-tests: mutter-test-unit-tests
-	./mutter-test-unit-tests
-
-run-tests: run-test-runner-tests run-unit-tests
-
 endif

 # Some random test programs for bits of the code
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,12 +45,12 @@ mutter_built_sources = \

 if HAVE_WAYLAND
 mutter_built_sources += \
+	primary-selection-unstable-v1-protocol.c			\
+	primary-selection-unstable-v1-server-protocol.h			\
 	pointer-gestures-unstable-v1-protocol.c				\
 	pointer-gestures-unstable-v1-server-protocol.h			\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
-	gtk-primary-selection-protocol.c				\
-	gtk-primary-selection-server-protocol.h				\
 	xdg-shell-unstable-v5-protocol.c				\
 	xdg-shell-unstable-v5-server-protocol.h				\
 	relative-pointer-unstable-v1-protocol.c				\
@@ -62,7 +62,6 @@ endif

 wayland_protocols =				\
 	wayland/protocol/gtk-shell.xml		\
-	wayland/protocol/gtk-primary-selection.xml	\
 	$(NULL)

 libmutter_la_SOURCES =				\
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -64,8 +64,6 @@ struct _MetaBackendPrivate
  MetaInputSettings *input_settings;

  ClutterActor *stage;
-
-  guint device_update_idle_id;
 };
 typedef struct _MetaBackendPrivate MetaBackendPrivate;

@@ -80,9 +78,6 @@ meta_backend_finalize (GObject *object)
  g_clear_object (&priv->monitor_manager);
  g_clear_object (&priv->input_settings);

-  if (priv->device_update_idle_id)
-    g_source_remove (priv->device_update_idle_id);
-
  g_hash_table_destroy (backend->device_monitors);

  G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
@@ -522,44 +517,12 @@ meta_backend_get_stage (MetaBackend *backend)
  return priv->stage;
 }

-static gboolean
-update_last_device (MetaBackend *backend)
-{
-  MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  ClutterInputDeviceType device_type;
-  ClutterDeviceManager *manager;
-  ClutterInputDevice *device;
-
-  priv->device_update_idle_id = 0;
-  manager = clutter_device_manager_get_default ();
-  device = clutter_device_manager_get_device (manager,
-                                              backend->current_device_id);
-  device_type = clutter_input_device_get_device_type (device);
-
-  g_signal_emit_by_name (backend, "last-device-changed",
-                         backend->current_device_id);
-
-  switch (device_type)
-    {
-    case CLUTTER_KEYBOARD_DEVICE:
-      break;
-    case CLUTTER_TOUCHSCREEN_DEVICE:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
-      break;
-    default:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
-      break;
-    }
-
-  return G_SOURCE_REMOVE;
-}
-
 void
 meta_backend_update_last_device (MetaBackend *backend,
                                 int          device_id)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+  ClutterInputDeviceType device_type;
+  MetaCursorTracker *cursor_tracker;
  ClutterDeviceManager *manager;
  ClutterInputDevice *device;

@@ -573,14 +536,23 @@ meta_backend_update_last_device (MetaBackend *backend,
      clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
    return;

-  backend->current_device_id = device_id;
+  device_type = clutter_input_device_get_device_type (device);

-  if (priv->device_update_idle_id == 0)
+  cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
+  backend->current_device_id = device_id;
+  g_signal_emit_by_name (backend, "last-device-changed", device_id);
+
+  if (device_type == CLUTTER_KEYBOARD_DEVICE)
+    return;
+
+  switch (device_type)
    {
-      priv->device_update_idle_id =
-        g_idle_add ((GSourceFunc) update_last_device, backend);
-      g_source_set_name_by_id (priv->device_update_idle_id,
-                               "[mutter] update_last_device");
+    case CLUTTER_TOUCHSCREEN_DEVICE:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
+      break;
+    default:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
+      break;
    }
 }

--- a/src/core/main.c
+++ b/src/core/main.c
@@ -168,7 +168,6 @@ static gboolean  opt_disable_sm;
 static gboolean  opt_sync;
 #ifdef HAVE_WAYLAND
 static gboolean  opt_wayland;
-static gboolean  opt_nested;
 #endif
 #ifdef HAVE_NATIVE_BACKEND
 static gboolean  opt_display_server;
@@ -217,12 +216,6 @@ static GOptionEntry meta_options[] = {
    N_("Run as a wayland compositor"),
    NULL
  },
-  {
-    "nested", 0, 0, G_OPTION_ARG_NONE,
-    &opt_nested,
-    N_("Run as a nested compositor"),
-    NULL
-  },
 #endif
 #ifdef HAVE_NATIVE_BACKEND
  {
@@ -373,30 +366,21 @@ check_for_wayland_session_type (void)
 static void
 init_backend (void)
 {
-#ifdef HAVE_WAYLAND
-  gboolean run_as_wayland_compositor = opt_wayland;
+  gboolean session_type_is_wayland = FALSE;

-#ifdef HAVE_NATIVE_BACKEND
-  if (opt_nested && opt_display_server)
-    {
-      meta_warning ("Can't run both as nested and as a display server\n");
-      meta_exit (META_EXIT_ERROR);
-    }
+#if defined(HAVE_WAYLAND) && defined(HAVE_NATIVE_BACKEND)
+  session_type_is_wayland = check_for_wayland_session_type ();
+#endif

-  if (!run_as_wayland_compositor)
-    run_as_wayland_compositor = check_for_wayland_session_type ();
-
-#ifdef CLUTTER_WINDOWING_EGL
-  if (opt_display_server || (run_as_wayland_compositor && !opt_nested))
+#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
+  if (opt_display_server || session_type_is_wayland)
    clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
  else
-#endif
-#endif
 #endif
    clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);

 #ifdef HAVE_WAYLAND
-  meta_set_is_wayland_compositor (run_as_wayland_compositor);
+  meta_set_is_wayland_compositor (opt_wayland || session_type_is_wayland);
 #endif
 }

--- a/src/core/util.c
+++ b/src/core/util.c
@@ -49,9 +49,6 @@ meta_topic_real_valist (MetaDebugTopic topic,
                        va_list        args) G_GNUC_PRINTF(2, 0);
 #endif

-static gboolean
-meta_later_remove_from_list (guint later_id, GSList **laters_list);
-
 static gint verbose_topics = 0;
 static gboolean is_debugging = FALSE;
 static gboolean replace_current = FALSE;
@@ -742,14 +739,7 @@ typedef struct
  gboolean run_once;
 } MetaLater;

-static GSList *laters[] = {
-  NULL, /* META_LATER_RESIZE */
-  NULL, /* META_LATER_CALC_SHOWING */
-  NULL, /* META_LATER_CHECK_FULLSCREEN */
-  NULL, /* META_LATER_SYNC_STACK */
-  NULL, /* META_LATER_BEFORE_REDRAW */
-  NULL, /* META_LATER_IDLE */
-};
+static GSList *laters = NULL;
 /* This is a dummy timeline used to get the Clutter master clock running */
 static ClutterTimeline *later_timeline;
 static guint later_repaint_func = 0;
@@ -782,14 +772,25 @@ destroy_later (MetaLater *later)
  unref_later (later);
 }

-static void
-run_repaint_laters (GSList **laters_list)
+/* Used to sort the list of laters with the highest priority
+ * functions first.
+ */
+static int
+compare_laters (gconstpointer a,
+                gconstpointer b)
+{
+  return ((const MetaLater *)a)->when - ((const MetaLater *)b)->when;
+}
+
+static gboolean
+run_repaint_laters (gpointer data)
 {
  GSList *laters_copy;
  GSList *l;
+  gboolean keep_timeline_running = FALSE;

  laters_copy = NULL;
-  for (l = *laters_list; l; l = l->next)
+  for (l = laters; l; l = l->next)
    {
      MetaLater *later = l->data;
      if (later->source == 0 ||
@@ -805,41 +806,22 @@ run_repaint_laters (GSList **laters_list)
    {
      MetaLater *later = l->data;

-      if (!later->func || !later->func (later->data))
-        meta_later_remove_from_list (later->id, laters_list);
-      unref_later (later);
-    }
-
-  g_slist_free (laters_copy);
-}
-
-static gboolean
-run_all_repaint_laters (gpointer data)
-{
-  guint i;
-  GSList *l;
-  gboolean keep_timeline_running = FALSE;
-
-  for (i = 0; i < G_N_ELEMENTS (laters); i++)
-    {
-      run_repaint_laters (&laters[i]);
-    }
-
-  for (i = 0; i < G_N_ELEMENTS (laters); i++)
-    {
-      for (l = laters[i]; l; l = l->next)
+      if (later->func && later->func (later->data))
        {
-          MetaLater *later = l->data;
-
          if (later->source == 0)
            keep_timeline_running = TRUE;
        }
+      else
+        meta_later_remove (later->id);
+      unref_later (later);
    }

  if (!keep_timeline_running)
    clutter_timeline_stop (later_timeline);

-  /* Just keep the repaint func around - it's cheap if the lists are empty */
+  g_slist_free (laters_copy);
+
+  /* Just keep the repaint func around - it's cheap if the list is empty */
  return TRUE;
 }

@@ -850,7 +832,7 @@ ensure_later_repaint_func (void)
    later_timeline = clutter_timeline_new (G_MAXUINT);

  if (later_repaint_func == 0)
-    later_repaint_func = clutter_threads_add_repaint_func (run_all_repaint_laters,
+    later_repaint_func = clutter_threads_add_repaint_func (run_repaint_laters,
                                                           NULL, NULL);

  /* Make sure the repaint function gets run */
@@ -906,7 +888,7 @@ meta_later_add (MetaLaterType  when,
  later->data = data;
  later->notify = notify;

-  laters[when] = g_slist_prepend (laters[when], later);
+  laters = g_slist_insert_sorted (laters, later, compare_laters);

  switch (when)
    {
@@ -938,29 +920,6 @@ meta_later_add (MetaLaterType  when,
  return later->id;
 }

-static gboolean
-meta_later_remove_from_list (guint later_id, GSList **laters_list)
-{
-  GSList *l;
-
-  for (l = *laters_list; l; l = l->next)
-    {
-      MetaLater *later = l->data;
-
-      if (later->id == later_id)
-        {
-          *laters_list = g_slist_delete_link (*laters_list, l);
-          /* If this was a "repaint func" later, we just let the
-           * repaint func run and get removed
-           */
-          destroy_later (later);
-          return TRUE;
-        }
-    }
-
-  return FALSE;
-}
-
 /**
 * meta_later_remove:
 * @later_id: the integer ID returned from meta_later_add()
@@ -970,12 +929,20 @@ meta_later_remove_from_list (guint later_id, GSList **laters_list)
 void
 meta_later_remove (guint later_id)
 {
-  guint i;
+  GSList *l;

-  for (i = 0; i < G_N_ELEMENTS (laters); i++)
+  for (l = laters; l; l = l->next)
    {
-      if (meta_later_remove_from_list (later_id, &laters[i]))
-        return;
+      MetaLater *later = l->data;
+      if (later->id == later_id)
+        {
+          laters = g_slist_delete_link (laters, l);
+          /* If this was a "repaint func" later, we just let the
+           * repaint func run and get removed
+           */
+          destroy_later (later);
+          return;
+        }
    }
 }

--- a/src/tests/unit-tests.c
+++ b/src/tests/unit-tests.c
@@ -1,238 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <glib.h>
-#include <stdlib.h>
-
-#include <meta/main.h>
-#include <meta/util.h>
-
-#include "compositor/meta-plugin-manager.h"
-
-typedef struct _MetaTestLaterOrderCallbackData
-{
-  GMainLoop *loop; /* Loop to terminate when done. */
-  int callback_num; /* Callback number integer. */
-  int *expected_callback_num; /* Pointer to the expected callback number. */
-} MetaTestLaterOrderCallbackData;
-
-static gboolean
-test_later_order_callback (gpointer user_data)
-{
-  MetaTestLaterOrderCallbackData *data = user_data;
-
-  g_assert_cmpint (data->callback_num, ==, *data->expected_callback_num);
-
-  if (*data->expected_callback_num == 0)
-    g_main_loop_quit (data->loop);
-  else
-    (*data->expected_callback_num)--;
-
-  return FALSE;
-}
-
-static void
-meta_test_util_later_order (void)
-{
-  GMainLoop *loop;
-  int expected_callback_num;
-  int i;
-  const int num_callbacks = 3;
-  MetaTestLaterOrderCallbackData callback_data[num_callbacks];
-
-  loop = g_main_loop_new (NULL, FALSE);
-
-  /* Schedule three BEFORE_DRAW callbacks each with its own number associated
-   * with it.
-   */
-  for (i = 0; i < num_callbacks; i++)
-    {
-      callback_data[i] = (MetaTestLaterOrderCallbackData) {
-        .loop = loop,
-        .callback_num = i,
-        .expected_callback_num = &expected_callback_num,
-      };
-      meta_later_add (META_LATER_BEFORE_REDRAW,
-                      test_later_order_callback,
-                      &callback_data[i],
-                      NULL);
-    }
-
-  /* Check that the callbacks are invoked in the opposite order that they were
-   * scheduled. Each callback will decrease the number by 1 after it checks the
-   * validity.
-   */
-  expected_callback_num = num_callbacks - 1;
-  g_main_loop_run (loop);
-  g_assert_cmpint (expected_callback_num, ==, 0);
-  g_main_loop_unref (loop);
-}
-
-typedef enum _MetaTestLaterScheduleFromLaterState
-{
-  META_TEST_LATER_EXPECT_CALC_SHOWING,
-  META_TEST_LATER_EXPECT_SYNC_STACK,
-  META_TEST_LATER_EXPECT_BEFORE_REDRAW,
-  META_TEST_LATER_FINISHED,
-} MetaTestLaterScheduleFromLaterState;
-
-typedef struct _MetaTestLaterScheduleFromLaterData
-{
-  GMainLoop *loop;
-  MetaTestLaterScheduleFromLaterState state;
-} MetaTestLaterScheduleFromLaterData;
-
-static gboolean
-test_later_schedule_from_later_sync_stack_callback (gpointer user_data);
-
-static gboolean
-test_later_schedule_from_later_calc_showing_callback (gpointer user_data)
-{
-  MetaTestLaterScheduleFromLaterData *data = user_data;
-
-  g_assert_cmpint (data->state, ==, META_TEST_LATER_EXPECT_CALC_SHOWING);
-
-  meta_later_add (META_LATER_SYNC_STACK,
-                  test_later_schedule_from_later_sync_stack_callback,
-                  data,
-                  NULL);
-
-  data->state = META_TEST_LATER_EXPECT_SYNC_STACK;
-
-  return FALSE;
-}
-
-static gboolean
-test_later_schedule_from_later_sync_stack_callback (gpointer user_data)
-{
-  MetaTestLaterScheduleFromLaterData *data = user_data;
-
-  g_assert_cmpint (data->state, ==, META_TEST_LATER_EXPECT_SYNC_STACK);
-
-  data->state = META_TEST_LATER_EXPECT_BEFORE_REDRAW;
-
-  return FALSE;
-}
-
-static gboolean
-test_later_schedule_from_later_before_redraw_callback (gpointer user_data)
-{
-  MetaTestLaterScheduleFromLaterData *data = user_data;
-
-  g_assert_cmpint (data->state, ==, META_TEST_LATER_EXPECT_BEFORE_REDRAW);
-  data->state = META_TEST_LATER_FINISHED;
-  g_main_loop_quit (data->loop);
-
-  return FALSE;
-}
-
-static void
-meta_test_util_later_schedule_from_later (void)
-{
-  MetaTestLaterScheduleFromLaterData data;
-
-  data.loop = g_main_loop_new (NULL, FALSE);
-
-  /* Test that scheduling a MetaLater with 'when' being later than the one being
-   * invoked causes it to be invoked before any callback with a later 'when'
-   * value being invoked.
-   *
-   * The first and last callback is queued here. The one to be invoked in
-   * between is invoked in test_later_schedule_from_later_calc_showing_callback.
-   */
-  meta_later_add (META_LATER_CALC_SHOWING,
-                  test_later_schedule_from_later_calc_showing_callback,
-                  &data,
-                  NULL);
-  meta_later_add (META_LATER_BEFORE_REDRAW,
-                  test_later_schedule_from_later_before_redraw_callback,
-                  &data,
-                  NULL);
-
-  data.state = META_TEST_LATER_EXPECT_CALC_SHOWING;
-
-  g_main_loop_run (data.loop);
-  g_main_loop_unref (data.loop);
-
-  g_assert_cmpint (data.state, ==, META_TEST_LATER_FINISHED);
-}
-
-static gboolean
-run_tests (gpointer data)
-{
-  gboolean ret;
-
-  ret = g_test_run ();
-
-  meta_quit (ret != 0);
-
-  return FALSE;
-}
-
-static void
-init_tests (int argc, char **argv)
-{
-  g_test_init (&argc, &argv, NULL);
-  g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=");
-
-  g_test_add_func ("/util/meta-later/order", meta_test_util_later_order);
-  g_test_add_func ("/util/meta-later/schedule-from-later",
-                   meta_test_util_later_schedule_from_later);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GOptionContext *ctx;
-  GError *error = NULL;
-
-  ctx = g_option_context_new (NULL);
-
-  if (!g_option_context_parse (ctx,
-                               &argc, &argv, &error))
-    {
-      g_printerr ("%s", error->message);
-      return 1;
-    }
-
-  g_option_context_free (ctx);
-
-  char *fake_args[] = { NULL, "--wayland" };
-  fake_args[0] = argv[0];
-  char **fake_argv = fake_args;
-  int fake_argc = 2;
-
-  ctx = meta_get_option_context ();
-  if (!g_option_context_parse (ctx, &fake_argc, &fake_argv, &error))
-    {
-      g_printerr ("mutter: %s\n", error->message);
-      exit (1);
-    }
-  g_option_context_free (ctx);
-
-  meta_plugin_manager_load ("default");
-
-  meta_init ();
-  meta_register_with_session ();
-
-  init_tests (argc, argv);
-  g_idle_add (run_tests, NULL);
-
-  return meta_run ();
-}
--- a/src/wayland/meta-wayland-buffer.c
+++ b/src/wayland/meta-wayland-buffer.c
@@ -30,8 +30,6 @@
 #include <cogl/cogl-wayland-server.h>
 #include <meta/util.h>

-G_DEFINE_TYPE (MetaWaylandBuffer, meta_wayland_buffer, G_TYPE_OBJECT);
-
 static void
 meta_wayland_buffer_destroy_handler (struct wl_listener *listener,
                                     void *data)
@@ -39,16 +37,32 @@ meta_wayland_buffer_destroy_handler (struct wl_listener *listener,
  MetaWaylandBuffer *buffer =
    wl_container_of (listener, buffer, destroy_listener);

-  buffer->resource = NULL;
  wl_signal_emit (&buffer->destroy_signal, buffer);
-  g_object_unref (buffer);
+  g_slice_free (MetaWaylandBuffer, buffer);
+}
+
+void
+meta_wayland_buffer_ref (MetaWaylandBuffer *buffer)
+{
+  buffer->ref_count++;
+}
+
+void
+meta_wayland_buffer_unref (MetaWaylandBuffer *buffer)
+{
+  buffer->ref_count--;
+
+  if (buffer->ref_count == 0)
+    {
+      g_warn_if_fail (buffer->use_count == 0);
+
+      g_clear_pointer (&buffer->texture, cogl_object_unref);
+    }
 }

 void
 meta_wayland_buffer_ref_use_count (MetaWaylandBuffer *buffer)
 {
-  g_warn_if_fail (buffer->resource);
-
  buffer->use_count++;
 }

@@ -59,7 +73,7 @@ meta_wayland_buffer_unref_use_count (MetaWaylandBuffer *buffer)

  buffer->use_count--;

-  if (buffer->use_count == 0 && buffer->resource)
+  if (buffer->use_count == 0)
    wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
 }

@@ -79,7 +93,7 @@ meta_wayland_buffer_from_resource (struct wl_resource *resource)
    }
  else
    {
-      buffer = g_object_new (META_TYPE_WAYLAND_BUFFER, NULL);
+      buffer = g_slice_new0 (MetaWaylandBuffer);

      buffer->resource = resource;
      wl_signal_init (&buffer->destroy_signal);
@@ -99,7 +113,6 @@ meta_wayland_buffer_ensure_texture (MetaWaylandBuffer *buffer)
  struct wl_shm_buffer *shm_buffer;

  g_return_val_if_fail (buffer->use_count != 0, NULL);
-  g_return_val_if_fail (buffer->resource, NULL);

  if (buffer->texture)
    goto out;
@@ -159,26 +172,3 @@ meta_wayland_buffer_process_damage (MetaWaylandBuffer *buffer,
      wl_shm_buffer_end_access (shm_buffer);
    }
 }
-
-static void
-meta_wayland_buffer_finalize (GObject *object)
-{
-  MetaWaylandBuffer *buffer = META_WAYLAND_BUFFER (object);
-
-  g_clear_pointer (&buffer->texture, cogl_object_unref);
-
-  G_OBJECT_CLASS (meta_wayland_buffer_parent_class)->finalize (object);
-}
-
-static void
-meta_wayland_buffer_init (MetaWaylandBuffer *buffer)
-{
-}
-
-static void
-meta_wayland_buffer_class_init (MetaWaylandBufferClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_wayland_buffer_finalize;
-}
--- a/src/wayland/meta-wayland-buffer.h
+++ b/src/wayland/meta-wayland-buffer.h
@@ -33,21 +33,18 @@

 struct _MetaWaylandBuffer
 {
-  GObject parent;
-
  struct wl_resource *resource;
  struct wl_signal destroy_signal;
  struct wl_listener destroy_listener;

  CoglTexture *texture;
+  uint32_t ref_count;
  uint32_t use_count;
 };

-#define META_TYPE_WAYLAND_BUFFER (meta_wayland_buffer_get_type ())
-G_DECLARE_FINAL_TYPE (MetaWaylandBuffer, meta_wayland_buffer,
-                      META, WAYLAND_BUFFER, GObject);
-
 MetaWaylandBuffer *     meta_wayland_buffer_from_resource       (struct wl_resource    *resource);
+void                    meta_wayland_buffer_ref                 (MetaWaylandBuffer     *buffer);
+void                    meta_wayland_buffer_unref               (MetaWaylandBuffer     *buffer);
 void                    meta_wayland_buffer_ref_use_count       (MetaWaylandBuffer     *buffer);
 void                    meta_wayland_buffer_unref_use_count     (MetaWaylandBuffer     *buffer);
 CoglTexture *           meta_wayland_buffer_ensure_texture      (MetaWaylandBuffer     *buffer);
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -37,7 +37,7 @@
 #include "meta-wayland-private.h"
 #include "meta-dnd-actor-private.h"

-#include "gtk-primary-selection-server-protocol.h"
+#include "primary-selection-unstable-v1-server-protocol.h"

 #define ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \
                     WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \
@@ -75,8 +75,6 @@ typedef struct _MetaWaylandDataSourceWayland
 typedef struct _MetaWaylandDataSourcePrimary
 {
  MetaWaylandDataSourceWayland parent;
-
-  struct wl_resource *resource;
 } MetaWaylandDataSourcePrimary;

 G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandDataSource, meta_wayland_data_source,
@@ -84,7 +82,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandDataSource, meta_wayland_data_source,
 G_DEFINE_TYPE (MetaWaylandDataSourceWayland, meta_wayland_data_source_wayland,
               META_TYPE_WAYLAND_DATA_SOURCE);
 G_DEFINE_TYPE (MetaWaylandDataSourcePrimary, meta_wayland_data_source_primary,
-               META_TYPE_WAYLAND_DATA_SOURCE);
+               META_TYPE_WAYLAND_DATA_SOURCE_WAYLAND);

 static MetaWaylandDataSource *
 meta_wayland_data_source_wayland_new (struct wl_resource *resource);
@@ -365,8 +363,7 @@ data_offer_receive (struct wl_client *client, struct wl_resource *resource,
 }

 static void
-default_destructor (struct wl_client   *client,
-                    struct wl_resource *resource)
+data_offer_destroy (struct wl_client *client, struct wl_resource *resource)
 {
  wl_resource_destroy (resource);
 }
@@ -440,20 +437,20 @@ data_offer_set_actions (struct wl_client   *client,
 static const struct wl_data_offer_interface data_offer_interface = {
  data_offer_accept,
  data_offer_receive,
-  default_destructor,
+  data_offer_destroy,
  data_offer_finish,
  data_offer_set_actions,
 };

 static void
 primary_offer_receive (struct wl_client *client, struct wl_resource *resource,
-                       const char *mime_type, int32_t fd)
+                       const char *mime_type, int32_t fd, uint32_t serial)
 {
  MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource);
  MetaWaylandDataSource *source = offer->source;
  MetaWaylandSeat *seat;

-  if (!offer->source)
+  if (!source)
    {
      close (fd);
      return;
@@ -461,19 +458,14 @@ primary_offer_receive (struct wl_client *client, struct wl_resource *resource,

  seat = meta_wayland_data_source_get_seat (source);

-  if (wl_resource_get_client (offer->resource) !=
-      meta_wayland_keyboard_get_focus_client (&seat->keyboard))
-    {
-      close (fd);
-      return;
-    }
-
-  meta_wayland_data_source_send (offer->source, mime_type, fd);
+  if (serial == seat->keyboard.key_serial ||
+      serial == seat->pointer.click_serial)
+    meta_wayland_data_source_send (source, mime_type, fd);
 }

-static const struct gtk_primary_selection_offer_interface primary_offer_interface = {
+static const struct zwp_primary_selection_offer_v1_interface primary_offer_interface = {
  primary_offer_receive,
-  default_destructor,
+  data_offer_destroy,
 };

 static void
@@ -492,16 +484,12 @@ static void
 destroy_data_offer (struct wl_resource *resource)
 {
  MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource);
-  MetaWaylandSeat *seat;

  if (offer->source)
    {
-      seat = meta_wayland_data_source_get_seat (offer->source);
-
      if (offer == meta_wayland_data_source_get_current_offer (offer->source))
        {
-          if (seat && seat->data_device.dnd_data_source == offer->source &&
-              wl_resource_get_version (offer->resource) <
+          if (wl_resource_get_version (offer->resource) <
              WL_DATA_OFFER_ACTION_SINCE_VERSION)
            meta_wayland_data_source_notify_finish (offer->source);
          else
@@ -520,28 +508,6 @@ destroy_data_offer (struct wl_resource *resource)
  g_slice_free (MetaWaylandDataOffer, offer);
 }

-static void
-destroy_primary_offer (struct wl_resource *resource)
-{
-  MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource);
-
-  if (offer->source)
-    {
-      if (offer == meta_wayland_data_source_get_current_offer (offer->source))
-        {
-          meta_wayland_data_source_cancel (offer->source);
-          meta_wayland_data_source_set_current_offer (offer->source, NULL);
-        }
-
-      g_object_remove_weak_pointer (G_OBJECT (offer->source),
-                                    (gpointer *)&offer->source);
-      offer->source = NULL;
-    }
-
-  meta_display_sync_wayland_input_focus (meta_get_display ());
-  g_slice_free (MetaWaylandDataOffer, offer);
-}
-
 static struct wl_resource *
 meta_wayland_data_source_send_offer (MetaWaylandDataSource *source,
                                     struct wl_resource *target)
@@ -584,17 +550,17 @@ meta_wayland_data_source_send_primary_offer (MetaWaylandDataSource *source,
  offer->source = source;
  g_object_add_weak_pointer (G_OBJECT (source), (gpointer *)&offer->source);
  offer->resource = wl_resource_create (wl_resource_get_client (target),
-                                        &gtk_primary_selection_offer_interface,
+                                        &zwp_primary_selection_offer_v1_interface,
                                        wl_resource_get_version (target), 0);
  wl_resource_set_implementation (offer->resource,
                                  &primary_offer_interface,
                                  offer,
-                                  destroy_primary_offer);
+                                  destroy_data_offer);

-  gtk_primary_selection_device_send_data_offer (target, offer->resource);
+  zwp_primary_selection_device_v1_send_data_offer (target, offer->resource);

  wl_array_for_each (p, &priv->mime_types)
-    gtk_primary_selection_offer_send_offer (offer->resource, *p);
+    zwp_primary_selection_offer_v1_send_offer (offer->resource, *p);

  meta_wayland_data_source_set_current_offer (source, offer);

@@ -611,6 +577,12 @@ data_source_offer (struct wl_client *client,
    wl_resource_post_no_memory (resource);
 }

+static void
+data_source_destroy (struct wl_client *client, struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
 static void
 data_source_set_actions (struct wl_client   *client,
                         struct wl_resource *resource,
@@ -652,24 +624,13 @@ data_source_set_actions (struct wl_client   *client,

 static struct wl_data_source_interface data_source_interface = {
  data_source_offer,
-  default_destructor,
+  data_source_destroy,
  data_source_set_actions
 };

-static void
-primary_source_offer (struct wl_client   *client,
-                      struct wl_resource *resource,
-                      const char         *type)
-{
-  MetaWaylandDataSource *source = wl_resource_get_user_data (resource);
-
-  if (!meta_wayland_data_source_add_mime_type (source, type))
-    wl_resource_post_no_memory (resource);
-}
-
-static struct gtk_primary_selection_source_interface primary_source_interface = {
-  primary_source_offer,
-  default_destructor,
+static struct zwp_primary_selection_source_v1_interface primary_source_interface = {
+  data_source_offer,
+  data_source_destroy,
 };

 struct _MetaWaylandDragGrab {
@@ -1224,21 +1185,20 @@ meta_wayland_data_source_primary_send (MetaWaylandDataSource *source,
                                       const gchar           *mime_type,
                                       gint                   fd)
 {
-  MetaWaylandDataSourcePrimary *source_primary;
+  MetaWaylandDataSourceWayland *source_wayland;

-  source_primary = META_WAYLAND_DATA_SOURCE_PRIMARY (source);
-  gtk_primary_selection_source_send_send (source_primary->resource,
-                                          mime_type, fd);
-  close (fd);
+  source_wayland = (MetaWaylandDataSourceWayland *) source;
+  zwp_primary_selection_source_v1_send_send (source_wayland->resource,
+                                             mime_type, fd);
 }

 static void
 meta_wayland_data_source_primary_cancel (MetaWaylandDataSource *source)
 {
-  MetaWaylandDataSourcePrimary *source_primary;
+  MetaWaylandDataSourceWayland *source_wayland;

-  source_primary = META_WAYLAND_DATA_SOURCE_PRIMARY (source);
-  gtk_primary_selection_source_send_cancelled (source_primary->resource);
+  source_wayland = (MetaWaylandDataSourceWayland *) source;
+  zwp_primary_selection_source_v1_send_cancelled (source_wayland->resource);
 }

 static void
@@ -1254,6 +1214,7 @@ meta_wayland_data_source_primary_class_init (MetaWaylandDataSourcePrimaryClass *

  data_source_class->send = meta_wayland_data_source_primary_send;
  data_source_class->cancel = meta_wayland_data_source_primary_cancel;
+  data_source_class->target = NULL;
 }

 static void
@@ -1488,10 +1449,16 @@ data_device_set_selection (struct wl_client *client,
  meta_wayland_data_device_set_selection (data_device, source, serial);
 }

+static void
+data_device_release(struct wl_client *client, struct wl_resource *resource)
+{
+  wl_resource_destroy(resource);
+}
+
 static const struct wl_data_device_interface data_device_interface = {
  data_device_start_drag,
  data_device_set_selection,
-  default_destructor,
+  data_device_release,
 };

 static void
@@ -1511,44 +1478,28 @@ primary_source_destroyed (gpointer  data,

      data_device_resource = wl_resource_find_for_client (&data_device->primary_resource_list, focus_client);
      if (data_device_resource)
-        gtk_primary_selection_device_send_selection (data_device_resource, NULL);
+        zwp_primary_selection_device_v1_send_selection (data_device_resource, NULL);
    }
 }

 void
 meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device,
-                                      MetaWaylandDataSource *source,
-                                      guint32                serial)
+                                      MetaWaylandDataSource *source)
 {
  MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
  struct wl_resource *data_device_resource, *offer;
  struct wl_client *focus_client;

-  if (META_IS_WAYLAND_DATA_SOURCE_PRIMARY (source))
-    {
-      struct wl_resource *resource;
-
-      resource = META_WAYLAND_DATA_SOURCE_PRIMARY (source)->resource;
-
-      if (wl_resource_get_client (resource) !=
-          meta_wayland_keyboard_get_focus_client (&seat->keyboard))
-        return;
-    }
-
-  if (data_device->primary_data_source &&
-      data_device->primary_serial - serial < UINT32_MAX / 2)
-    return;
-
  if (data_device->primary_data_source)
    {
      meta_wayland_data_source_cancel (data_device->primary_data_source);
      g_object_weak_unref (G_OBJECT (data_device->primary_data_source),
                           primary_source_destroyed,
                           data_device);
+      data_device->primary_data_source = NULL;
    }

  data_device->primary_data_source = source;
-  data_device->primary_serial = serial;

  focus_client = meta_wayland_keyboard_get_focus_client (&seat->keyboard);
  if (focus_client)
@@ -1560,11 +1511,11 @@ meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device,
            {
              offer = meta_wayland_data_source_send_primary_offer (data_device->primary_data_source,
                                                                   data_device_resource);
-              gtk_primary_selection_device_send_selection (data_device_resource, offer);
+              zwp_primary_selection_device_v1_send_selection (data_device_resource, offer);
            }
          else
            {
-              gtk_primary_selection_device_send_selection (data_device_resource, NULL);
+              zwp_primary_selection_device_v1_send_selection (data_device_resource, NULL);
            }
        }
    }
@@ -1583,19 +1534,18 @@ meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device,
 static void
 primary_device_set_selection (struct wl_client   *client,
                              struct wl_resource *resource,
-                              struct wl_resource *source_resource,
-                              uint32_t            serial)
+                              struct wl_resource *source_resource)
 {
  MetaWaylandDataDevice *data_device = wl_resource_get_user_data (resource);
  MetaWaylandDataSource *source;

  source = wl_resource_get_user_data (source_resource);
-  meta_wayland_data_device_set_primary (data_device, source, serial);
+  meta_wayland_data_device_set_primary (data_device, source);
 }

-static const struct gtk_primary_selection_device_interface primary_device_interface = {
+static const struct zwp_primary_selection_device_v1_interface primary_device_interface = {
  primary_device_set_selection,
-  default_destructor,
+  data_device_release,
 };

 static void
@@ -1636,15 +1586,6 @@ static const struct wl_data_device_manager_interface manager_interface = {
  get_data_device
 };

-static void
-destroy_primary_source (struct wl_resource *resource)
-{
-  MetaWaylandDataSourcePrimary *source = wl_resource_get_user_data (resource);
-
-  source->resource = NULL;
-  g_object_unref (source);
-}
-
 static void
 primary_device_manager_create_source (struct wl_client   *client,
                                      struct wl_resource *manager_resource,
@@ -1653,7 +1594,7 @@ primary_device_manager_create_source (struct wl_client   *client,
  struct wl_resource *source_resource;

  source_resource =
-    wl_resource_create (client, &gtk_primary_selection_source_interface,
+    wl_resource_create (client, &zwp_primary_selection_source_v1_interface,
                        wl_resource_get_version (manager_resource),
                        id);
  meta_wayland_data_source_primary_new (source_resource);
@@ -1668,17 +1609,23 @@ primary_device_manager_get_device (struct wl_client   *client,
  MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
  struct wl_resource *cr;

-  cr = wl_resource_create (client, &gtk_primary_selection_device_interface,
+  cr = wl_resource_create (client, &zwp_primary_selection_device_v1_interface,
                           wl_resource_get_version (manager_resource), id);
  wl_resource_set_implementation (cr, &primary_device_interface,
                                  &seat->data_device, unbind_resource);
  wl_list_insert (&seat->data_device.primary_resource_list, wl_resource_get_link (cr));
 }

-static const struct gtk_primary_selection_device_manager_interface primary_manager_interface = {
+static void
+primary_device_manager_destroy (struct wl_client *client,
+                                struct wl_resource *manager_resource)
+{
+}
+
+static const struct zwp_primary_selection_device_manager_v1_interface primary_manager_interface = {
  primary_device_manager_create_source,
  primary_device_manager_get_device,
-  default_destructor,
+  primary_device_manager_destroy
 };

 static void
@@ -1698,7 +1645,7 @@ bind_primary_manager (struct wl_client *client,
 {
  struct wl_resource *resource;

-  resource = wl_resource_create (client, &gtk_primary_selection_device_manager_interface,
+  resource = wl_resource_create (client, &zwp_primary_selection_device_manager_v1_interface,
                                 version, id);
  wl_resource_set_implementation (resource, &primary_manager_interface, NULL, NULL);
 }
@@ -1713,7 +1660,7 @@ meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor)
    g_error ("Could not create data_device");

  if (wl_global_create (compositor->wayland_display,
-			&gtk_primary_selection_device_manager_interface,
+			&zwp_primary_selection_device_manager_v1_interface,
 			1, NULL, bind_primary_manager) == NULL)
    g_error ("Could not create data_device");
 }
@@ -1756,9 +1703,7 @@ meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device)
          wl_data_device_send_selection (data_device_resource, offer);
        }
      else
-        {
-          wl_data_device_send_selection (data_device_resource, NULL);
-        }
+        wl_data_device_send_selection (data_device_resource, NULL);
    }

  data_device_resource = wl_resource_find_for_client (&data_device->primary_resource_list, focus_client);
@@ -1768,11 +1713,11 @@ meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device)
      if (source)
        {
          offer = meta_wayland_data_source_send_primary_offer (source, data_device_resource);
-          gtk_primary_selection_device_send_selection (data_device_resource, offer);
+          zwp_primary_selection_device_v1_send_selection (data_device_resource, offer);
        }
      else
        {
-          gtk_primary_selection_device_send_selection (data_device_resource, NULL);
+          zwp_primary_selection_device_v1_send_selection (data_device_resource, NULL);
        }
    }
 }
@@ -1818,14 +1763,14 @@ meta_wayland_data_source_wayland_new (struct wl_resource *resource)
 static MetaWaylandDataSource *
 meta_wayland_data_source_primary_new (struct wl_resource *resource)
 {
-  MetaWaylandDataSourcePrimary *source_primary =
-    g_object_new (META_TYPE_WAYLAND_DATA_SOURCE_PRIMARY, NULL);
+  MetaWaylandDataSourceWayland *source_wayland =
+   g_object_new (META_TYPE_WAYLAND_DATA_SOURCE_PRIMARY, NULL);

-  source_primary->resource = resource;
+  source_wayland->resource = resource;
  wl_resource_set_implementation (resource, &primary_source_interface,
-                                  source_primary, destroy_primary_source);
+                                  source_wayland, destroy_data_source);

-  return META_WAYLAND_DATA_SOURCE (source_primary);
+  return META_WAYLAND_DATA_SOURCE (source_wayland);
 }

 gboolean
--- a/src/wayland/meta-wayland-data-device.h
+++ b/src/wayland/meta-wayland-data-device.h
@@ -55,7 +55,6 @@ struct _MetaWaylandDataSourceClass
 struct _MetaWaylandDataDevice
 {
  uint32_t selection_serial;
-  uint32_t primary_serial;
  MetaWaylandDataSource *selection_data_source;
  MetaWaylandDataSource *dnd_data_source;
  MetaWaylandDataSource *primary_data_source;
@@ -85,8 +84,7 @@ void meta_wayland_data_device_set_selection      (MetaWaylandDataDevice *data_de
                                                  MetaWaylandDataSource *source,
                                                  guint32 serial);
 void meta_wayland_data_device_set_primary        (MetaWaylandDataDevice *data_device,
-                                                  MetaWaylandDataSource *source,
-                                                  guint32                serial);
+                                                  MetaWaylandDataSource *source);

 gboolean meta_wayland_data_source_add_mime_type  (MetaWaylandDataSource *source,
                                                  const gchar           *mime_type);
--- a/src/wayland/meta-wayland-pointer-constraints.c
+++ b/src/wayland/meta-wayland-pointer-constraints.c
@@ -245,7 +245,7 @@ is_within_constraint_region (MetaWaylandPointerConstraint *constraint,
  return is_within;
 }

-static void
+void
 meta_wayland_pointer_constraint_maybe_enable (MetaWaylandPointerConstraint *constraint)
 {
  MetaWaylandSeat *seat = constraint->seat;
@@ -336,6 +336,12 @@ meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerCo
  return region;
 }

+cairo_region_t *
+meta_wayland_pointer_constraint_get_region (MetaWaylandPointerConstraint *constraint)
+{
+  return constraint->region;
+}
+
 MetaWaylandSurface *
 meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint)
 {
@@ -604,7 +610,7 @@ locked_pointer_set_cursor_position_hint (struct wl_client   *client,

  /* Ignore a set cursor hint that was already sent after the constraint
   * was cancelled. */
-  if (!constraint || !constraint->resource || constraint->resource != resource)
+  if (!constraint->resource || constraint->resource != resource)
    return;

  constraint->hint_set = TRUE;
@@ -622,9 +628,6 @@ locked_pointer_set_region (struct wl_client   *client,
  MetaWaylandRegion *region =
    region_resource ? wl_resource_get_user_data (region_resource) : NULL;

-  if (!constraint)
-    return;
-
  meta_wayland_pointer_constraint_set_pending_region (constraint, region);
 }

@@ -738,9 +741,6 @@ confined_pointer_set_region (struct wl_client   *client,
  MetaWaylandRegion *region =
    region_resource ? wl_resource_get_user_data (region_resource) : NULL;

-  if (!constraint)
-    return;
-
  meta_wayland_pointer_constraint_set_pending_region (constraint, region);
 }

--- a/src/wayland/meta-wayland-pointer-constraints.h
+++ b/src/wayland/meta-wayland-pointer-constraints.h
@@ -36,14 +36,20 @@ G_DECLARE_FINAL_TYPE (MetaWaylandPointerConstraint,
                      META, WAYLAND_POINTER_CONSTRAINT,
                      GObject);

+typedef struct _MetaWaylandPointerConstraint MetaWaylandPointerConstraint;
+
 void meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor);

+void meta_wayland_pointer_constraint_maybe_enable (MetaWaylandPointerConstraint *constraint);
+
 void meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constraint);

 MetaWaylandSeat * meta_wayland_pointer_constraint_get_seat (MetaWaylandPointerConstraint *constraint);

 cairo_region_t * meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerConstraint *constraint);

+cairo_region_t * meta_wayland_pointer_constraint_get_region (MetaWaylandPointerConstraint *constraint);
+
 MetaWaylandSurface * meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint);

 void meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -400,6 +400,9 @@ meta_wayland_pointer_send_button (MetaWaylandPointer *pointer,
      time = clutter_event_get_time (event);
      serial = wl_display_next_serial (display);

+      if (event->type == CLUTTER_BUTTON_PRESS)
+        pointer->click_serial = serial;
+
      wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
        {
          wl_pointer_send_button (resource, serial,
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -201,9 +201,28 @@ surface_set_buffer (MetaWaylandSurface *surface,
    return;

  if (surface->buffer)
-    surface_stop_using_buffer (surface);
+    {
+      wl_list_remove (&surface->buffer_destroy_listener.link);

-  g_set_object (&surface->buffer, buffer);
+      surface_stop_using_buffer (surface);
+      meta_wayland_buffer_unref (surface->buffer);
+    }
+
+  surface->buffer = buffer;
+
+  if (surface->buffer)
+    {
+      meta_wayland_buffer_ref (surface->buffer);
+      wl_signal_add (&surface->buffer->destroy_signal, &surface->buffer_destroy_listener);
+    }
+}
+
+static void
+surface_handle_buffer_destroy (struct wl_listener *listener, void *data)
+{
+  MetaWaylandSurface *surface = wl_container_of (listener, surface, buffer_destroy_listener);
+
+  surface_set_buffer (surface, NULL);
 }

 static void
@@ -1173,6 +1192,7 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
  surface->resource = wl_resource_create (client, &wl_surface_interface, wl_resource_get_version (compositor_resource), id);
  wl_resource_set_implementation (surface->resource, &meta_wayland_wl_surface_interface, surface, wl_surface_destructor);

+  surface->buffer_destroy_listener.notify = surface_handle_buffer_destroy;
  surface->surface_actor = g_object_ref_sink (meta_surface_actor_wayland_new (surface));

  wl_list_init (&surface->pending_frame_callback_list);
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -153,6 +153,7 @@ struct _MetaWaylandSurface
  MetaWindow *window;
  MetaWaylandBuffer *buffer;
  gboolean using_buffer;
+  struct wl_listener buffer_destroy_listener;
  cairo_region_t *input_region;
  cairo_region_t *opaque_region;
  int scale;
--- a/src/wayland/meta-xwayland-selection.c
+++ b/src/wayland/meta-xwayland-selection.c
@@ -1065,8 +1065,7 @@ meta_xwayland_selection_get_x11_targets (MetaWaylandCompositor *compositor,
        }
      else if (selection->selection_atom == gdk_x11_get_xatom_by_name ("PRIMARY"))
        {
-          meta_wayland_data_device_set_primary (&compositor->seat->data_device, data_source,
-                                                wl_display_next_serial (compositor->wayland_display));
+          meta_wayland_data_device_set_primary (&compositor->seat->data_device, data_source);
        }
    }
  else
--- a/src/wayland/protocol/gtk-primary-selection.xml
+++ b/src/wayland/protocol/gtk-primary-selection.xml
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="gtk_primary_selection">
-  <copyright>
-    Copyright © 2015, 2016 Red Hat
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <description summary="Primary selection protocol">
-    This protocol provides the ability to have a primary selection device to
-    match that of the X server. This primary selection is a shortcut to the
-    common clipboard selection, where text just needs to be selected in order
-    to allow copying it elsewhere. The de facto way to perform this action
-    is the middle mouse button, although it is not limited to this one.
-
-    Clients wishing to honor primary selection should create a primary
-    selection source and set it as the selection through
-    wp_primary_selection_device.set_selection whenever the text selection
-    changes. In order to minimize calls in pointer-driven text selection,
-    it should happen only once after the operation finished. Similarly,
-    a NULL source should be set when text is unselected.
-
-    wp_primary_selection_offer objects are first announced through the
-    wp_primary_selection_device.data_offer event. Immediately after this event,
-    the primary data offer will emit wp_primary_selection_offer.offer events
-    to let know of the mime types being offered.
-
-    When the primary selection changes, the client with the keyboard focus
-    will receive wp_primary_selection_device.selection events. Only the client
-    with the keyboard focus will receive such events with a non-NULL
-    wp_primary_selection_offer. Across keyboard focus changes, previously
-    focused clients will receive wp_primary_selection_device.events with a
-    NULL wp_primary_selection_offer.
-
-    In order to request the primary selection data, the client must pass
-    a recent serial pertaining to the press event that is triggering the
-    operation, if the compositor deems the serial valid and recent, the
-    wp_primary_selection_source.send event will happen in the other end
-    to let the transfer begin. The client owning the primary selection
-    should write the requested data, and close the file descriptor
-    immediately.
-
-    If the primary selection owner client disappeared during the transfer,
-    the client reading the data will receive a
-    wp_primary_selection_device.selection event with a NULL
-    wp_primary_selection_offer, the client should take this as a hint
-    to finish the reads related to the no longer existing offer.
-
-    The primary selection owner should be checking for errors during
-    writes, merely cancelling the ongoing transfer if any happened.
-  </description>
-
-  <interface name="gtk_primary_selection_device_manager" version="1">
-    <description summary="X primary selection emulation">
-      The primary selection device manager is a singleton global object that
-      provides access to the primary selection. It allows to create
-      wp_primary_selection_source objects, as well as retrieving the per-seat
-      wp_primary_selection_device objects.
-    </description>
-
-    <request name="create_source">
-      <description summary="create a new primary selection source">
-	Create a new primary selection source.
-      </description>
-      <arg name="id" type="new_id" interface="gtk_primary_selection_source"/>
-    </request>
-
-    <request name="get_device">
-      <description summary="create a new primary selection device">
-        Create a new data device for a given seat.
-      </description>
-      <arg name="id" type="new_id" interface="gtk_primary_selection_device"/>
-      <arg name="seat" type="object" interface="wl_seat"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the primary selection device manager">
-	Destroy the primary selection device manager.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="gtk_primary_selection_device" version="1">
-    <request name="set_selection">
-      <description summary="set the primary selection">
-	Replaces the current selection. The previous owner of the primary selection
-	will receive a wp_primary_selection_source.cancelled event.
-
-	To unset the selection, set the source to NULL.
-      </description>
-      <arg name="source" type="object" interface="gtk_primary_selection_source" allow-null="true"/>
-      <arg name="serial" type="uint" summary="serial of the event that triggered this request"/>
-    </request>
-
-    <event name="data_offer">
-      <description summary="introduce a new wp_primary_selection_offer">
-	Introduces a new wp_primary_selection_offer object that may be used
-	to receive the current primary selection. Immediately following this
-	event, the new wp_primary_selection_offer object will send
-	wp_primary_selection_offer.offer events to describe the offered mime
-	types.
-      </description>
-      <arg name="offer" type="new_id" interface="gtk_primary_selection_offer"/>
-    </event>
-
-    <event name="selection">
-      <description summary="advertise a new primary selection">
-	The wp_primary_selection_device.selection event is sent to notify the
-	client of a new primary selection. This event is sent after the
-	wp_primary_selection.data_offer event introducing this object, and after
-	the offer has announced its mimetypes through
-	wp_primary_selection_offer.offer.
-
-	The data_offer is valid until a new offer or NULL is received
-	or until the client loses keyboard focus. The client must destroy the
-	previous selection data_offer, if any, upon receiving this event.
-      </description>
-      <arg name="id" type="object" interface="gtk_primary_selection_offer" allow-null="true"/>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the primary selection device">
-	Destroy the primary selection device.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="gtk_primary_selection_offer" version="1">
-    <description summary="offer to transfer primary selection contents">
-      A wp_primary_selection_offer represents an offer to transfer the contents
-      of the primary selection clipboard to the client. Similar to
-      wl_data_offer, the offer also describes the mime types that the source
-      will transferthat the
-      data can be converted to and provides the mechanisms for transferring the
-      data directly to the client.
-    </description>
-
-    <request name="receive">
-      <description summary="request that the data is transferred">
-	To transfer the contents of the primary selection clipboard, the client
-	issues this request and indicates the mime type that it wants to
-	receive. The transfer happens through the passed file descriptor
-	(typically created with the pipe system call). The source client writes
-	the data in the mime type representation requested and then closes the
-	file descriptor.
-
-	The receiving client reads from the read end of the pipe until EOF and
-	closes its end, at which point the transfer is complete.
-      </description>
-      <arg name="mime_type" type="string"/>
-      <arg name="fd" type="fd"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the primary selection offer">
-	Destroy the primary selection offer.
-      </description>
-    </request>
-
-    <event name="offer">
-      <description summary="advertise offered mime type">
-	Sent immediately after creating announcing the wp_primary_selection_offer
-	through wp_primary_selection_device.data_offer. One event is sent per
-	offered mime type.
-      </description>
-      <arg name="mime_type" type="string"/>
-    </event>
-  </interface>
-
-  <interface name="gtk_primary_selection_source" version="1">
-    <description summary="offer to replace the contents of the primary selection">
-      The source side of a wp_primary_selection_offer, it provides a way to
-      describe the offered data and respond to requests to transfer the
-      requested contents of the primary selection clipboard.
-    </description>
-
-    <request name="offer">
-      <description summary="add an offered mime type">
-	This request adds a mime type to the set of mime types advertised to
-	targets. Can be called several times to offer multiple types.
-      </description>
-      <arg name="mime_type" type="string"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the primary selection source">
-	Destroy the primary selection source.
-      </description>
-    </request>
-
-    <event name="send">
-      <description summary="send the primary selection contents">
-	Request for the current primary selection contents from the client.
-	Send the specified mime type over the passed file descriptor, then
-	close it.
-      </description>
-      <arg name="mime_type" type="string"/>
-      <arg name="fd" type="fd"/>
-    </event>
-
-    <event name="cancelled">
-      <description summary="request for primary selection contents was canceled">
-	This primary selection source is no longer valid. The client should
-	clean up and destroy this primary selection source.
-      </description>
-    </event>
-  </interface>
-</protocol>