Merge branch 'i9c' with 3.40.4-10.1 into 'i9'

i9 changed/i9/evolution-3.40.4-10.el9_5.1.inferit
Sergey Cherevko 1 month ago
commit 867339849e
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,37 @@
diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
index bc423841a8..d3217cd48b 100644
--- a/src/modules/webkit-editor/e-webkit-editor.c
+++ b/src/modules/webkit-editor/e-webkit-editor.c
@@ -5724,6 +5724,24 @@ webkit_editor_button_press_event (GtkWidget *widget,
GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event);
}
+static gboolean
+webkit_editor_button_release_event (GtkWidget *widget,
+ GdkEventButton *event)
+{
+ if (event->button == 2) {
+ /* WebKitGTK 2.46.1 changed the middle-click paste behavior and moved
+ the paste handler from the button-press event into the button-release
+ event, which causes double paste of the clipboard content. As the paste
+ is handled in the webkit_editor_button_press_event() above, make sure
+ the release handler is not called here regardless whether the user
+ uses the changed WebkitGTK or not. */
+ return TRUE;
+ }
+
+ /* Chain up to parent's method. */
+ return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_release_event (widget, event);
+}
+
static gboolean
webkit_editor_key_press_event (GtkWidget *widget,
GdkEventKey *event)
@@ -5814,6 +5832,7 @@ e_webkit_editor_class_init (EWebKitEditorClass *class)
widget_class = GTK_WIDGET_CLASS (class);
widget_class->button_press_event = webkit_editor_button_press_event;
+ widget_class->button_release_event = webkit_editor_button_release_event;
widget_class->key_press_event = webkit_editor_key_press_event;
g_object_class_override_property (

@ -43,7 +43,7 @@
Name: evolution
Version: 3.40.4
Release: 10%{?dist}.inferit.1
Release: 10%{?dist}.1.inferit
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Evolution
@ -60,6 +60,7 @@ Patch04: webkitgtk-2.36.0-dark-theme.patch
Patch05: webkitgtk-2.36.0-disable-hw-accel.patch
Patch06: evolution-3.40.4-frame-flattenning.patch
Patch07: evolution-3.40.4-new-button.patch
Patch08: webkitgtk-2.46.1-middle-click-paste.patch
# MSVSphere
Patch1001: 0001-Updated-Russian-translation.patch
@ -580,6 +581,12 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
%endif
%changelog
* Mon Nov 18 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.40.4-10.1.inferit
- Update to 3.40.4-10.1
* Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.40.4-10.1
- Resolves: RHEL-62680 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
* Mon Sep 23 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.40.4-10.inferit.1
- Updating the Russian translation of the calendar
@ -611,7 +618,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.40.4-9
- Rebuilt for MSVSphere 9.2 beta
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.40.4-6
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.40.4-9
- Rebuilt for MSVSphere 9.1.
* Tue Jan 03 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-9

Loading…
Cancel
Save