Fix copy+paste of UTF8 strings between X11 and wayland
This commit is contained in:
parent
33f3aabd7e
commit
e4dd57ac55
@ -0,0 +1,32 @@
|
||||
From 5758401443d09e10184f11e61e6bb14f83688a89 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Wed, 10 May 2017 20:28:42 +0200
|
||||
Subject: [PATCH] xwayland: Use the right atom type for further selection
|
||||
requests to X11
|
||||
|
||||
If we translate between text/plain;charset-utf-8 from the wayland side to
|
||||
UTF8_STRING on the X11 side, we want to continue all further X11 selection
|
||||
requests using the same translated UTF8_STRING atom than we use in the
|
||||
first XConvertSelection call.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=782472
|
||||
---
|
||||
src/wayland/meta-xwayland-selection.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c
|
||||
index a78e84666..24b8cd2c1 100644
|
||||
--- a/src/wayland/meta-xwayland-selection.c
|
||||
+++ b/src/wayland/meta-xwayland-selection.c
|
||||
@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source,
|
||||
/* Takes ownership of fd */
|
||||
selection->x11_selection =
|
||||
x11_selection_data_new (compositor->xwayland_manager.selection_data,
|
||||
- fd, mime_type);
|
||||
+ fd, gdk_x11_get_xatom_name (type_atom));
|
||||
|
||||
XConvertSelection (xdisplay,
|
||||
selection->selection_atom, type_atom,
|
||||
--
|
||||
2.12.2
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
Name: mutter
|
||||
Version: 3.25.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
|
||||
License: GPLv2+
|
||||
@ -14,6 +14,7 @@ URL: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch0: startup-notification.patch
|
||||
Patch1: 0001-xwayland-Use-the-right-atom-type-for-further-selecti.patch
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: pango-devel
|
||||
@ -108,6 +109,7 @@ the functionality of the installed %{name} package.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
@ -180,6 +182,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
%{_datadir}/mutter/tests
|
||||
|
||||
%changelog
|
||||
* Thu May 18 2017 Florian Müllner <fmuellner@redhat.com> - 3.25.1-2
|
||||
- Fix copy+paste of UTF8 strings between X11 and wayland
|
||||
|
||||
* Thu Apr 27 2017 Florian Müllner <fmuellner@redhat.com> - 3.25.1-1
|
||||
- Update to 3.25.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user