Merge lp:~azzar1/gtk/fix-1720400 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Andrea Azzarone]

Apply proposed fix for a segmentation fault when adding Google online account.

[Jeremy Bícha (jbicha)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-10-16 12:35:41 +0000
+++ debian/changelog	2017-10-25 11:51:35 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.22.24-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Add clear_glcontext_on_window_withdraw.patch:
+    - Apply proposed fix for a segmentation fault when
+      adding Google online account (LP: #1720400)
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 25 Oct 2017 11:16:44 +0000
+
 gtk+3.0 (3.22.24-0ubuntu2) UNRELEASED; urgency=medium
 
   * Add 0004_fix-gtkentry-wayland-regression.patch:

=== added file 'debian/patches/clear_glcontext_on_window_withdraw.patch'
--- debian/patches/clear_glcontext_on_window_withdraw.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/clear_glcontext_on_window_withdraw.patch	2017-10-25 11:51:35 +0000
@@ -0,0 +1,32 @@
+Description: (gdk) Clear GL context when window is withdrawn
+ Some clients (e.g. gnome-online-accounts) quickly unmap and map
+ a window. With some backends the backend surface will be replaced
+ causing the application to crash because the GL context is still
+ using the old surface. Clearing the GL context when a window is
+ withdrawn fixes this.
+Author: Andrea Azzarone <[e-mail]>
+Origin: ubuntu
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=789141
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1720400
+
+--- a/gdk/gdkwindow.c
++++ b/gdk/gdkwindow.c
+@@ -5744,6 +5744,7 @@
+ {
+   GdkWindowImplClass *impl_class;
+   gboolean was_mapped;
++  GdkGLContext *current_context;
+ 
+   g_return_if_fail (GDK_IS_WINDOW (window));
+ 
+@@ -5768,6 +5769,10 @@
+ 	  _gdk_synthesize_crossing_events_for_geometry_change (window->parent);
+ 	}
+ 
++      current_context = gdk_gl_context_get_current ();
++      if (current_context != NULL && gdk_gl_context_get_window (current_context) == window)
++        gdk_gl_context_clear_current ();
++
+       recompute_visible_regions (window, FALSE);
+       gdk_window_clear_old_updated_area (window);
+     }

=== modified file 'debian/patches/series'
--- debian/patches/series	2017-10-16 12:35:41 +0000
+++ debian/patches/series	2017-10-25 11:51:35 +0000
@@ -28,3 +28,4 @@
 unity-headerbar-maximized-mode.patch
 gtksocket-unscale-before-sending-configurenotify.patch
 no_content_hub.patch
+clear_glcontext_on_window_withdraw.patch