Merge lp:~larsu/gtk/remove-black-flicker into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Lars Karlitski]

* Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
  - fixes black flickering when new windows are created

* Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
  - fixes black flickering when new windows are created

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-13 13:40:07 +0000
+++ debian/changelog	2015-11-16 16:36:54 +0000
@@ -1,3 +1,10 @@
+gtk+3.0 (3.18.4-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
+    - fixes black flickering when new windows are created
+
+ -- Lars Uebernickel <[e-mail]>  Mon, 16 Nov 2015 17:34:30 +0100
+
 gtk+3.0 (3.18.4-1ubuntu1) xenial; urgency=medium
 
   * Merge with Debian. Remaining changes:

=== added file 'debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch'
--- debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch	2015-11-16 16:36:54 +0000
@@ -0,0 +1,33 @@
+From e7528ab9b8ddbad892d9d5ce323549086897b72a Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Mon, 16 Nov 2015 17:29:50 +0100
+Subject: [PATCH] gtkwindow: continue calling
+ gtk_style_context_set_background()
+
+Not doing so introduces black flicker when creating a new window on
+compiz, because it lacks support for the frame sync protocol.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748498
+---
+ gtk/gtkwindow.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 2d9f4b5..0476b6b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -7122,6 +7122,11 @@ gtk_window_realize (GtkWidget *widget)
+   gtk_widget_register_window (widget, gdk_window);
+   gtk_widget_set_realized (widget, TRUE);
+ 
++  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
++  if (!gtk_widget_get_app_paintable (widget))
++    gtk_style_context_set_background (gtk_widget_get_style_context (widget), gdk_window);
++  G_GNUC_END_IGNORE_DEPRECATIONS
++
+   attributes.x = allocation.x;
+   attributes.y = allocation.y;
+   attributes.width = allocation.width;
+-- 
+2.6.2
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-11-12 18:03:04 +0000
+++ debian/patches/series	2015-11-16 16:36:54 +0000
@@ -23,3 +23,4 @@
 git_icon_fallback.patch
 unity_rbga_tooltips.patch
 git-refresh-mir-backend.patch
+0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch