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

[Lars Karlitski]

Replace d/p/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch with d/p/0001-gtkwindow-set-transparent-background-color.patch: the old fix broke client side shadow rendering on GNOME shell (LP: #1515561)

Replace d/p/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch with d/p/0001-gtkwindow-set-transparent-background-color.patch: the old fix broke client side shadow rendering on GNOME shell (LP: #1515561)

[Didier Roche-Tolomelli (didrocks)]

Looking good, building fine and tests seems ok! Sponsoring, thanks :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-17 14:21:53 +0000
+++ debian/changelog	2015-11-24 11:18:31 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.18.5-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Replace d/p/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch
+    with d/p/0001-gtkwindow-set-transparent-background-color.patch:
+    - the old fix broke client side shadow rendering on GNOME shell (LP: #1515561)
+
+ -- Lars Uebernickel <[e-mail]>  Tue, 24 Nov 2015 12:13:37 +0100
+
 gtk+3.0 (3.18.5-1ubuntu1) xenial; urgency=medium
 
   [ Iain Lane ]
 
=== removed 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	2015-11-16 16:35:19 +0000
+++ debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-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
-
 
=== added file 'debian/patches/0001-gtkwindow-set-transparent-background-color.patch'
--- debian/patches/0001-gtkwindow-set-transparent-background-color.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-gtkwindow-set-transparent-background-color.patch	2015-11-24 11:18:31 +0000
@@ -0,0 +1,27 @@
+From 7bb940fd507ae31e5a06509b1833dd7134ff8b4e Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Tue, 24 Nov 2015 12:08:46 +0100
+Subject: [PATCH] gtkwindow: set transparent background color
+
+To reduce black flickering when new windows are created on compiz.
+---
+ gtk/gtkwindow.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 2d9f4b5..460a199 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -7122,6 +7122,9 @@ gtk_window_realize (GtkWidget *widget)
+   gtk_widget_register_window (widget, gdk_window);
+   gtk_widget_set_realized (widget, TRUE);
+ 
++  GdkRGBA transparent = { 1.0, 1.0, 1.0, 0.0 };
++  gdk_window_set_background_rgba (gdk_window, &transparent);
++
+   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-16 16:35:19 +0000
+++ debian/patches/series	2015-11-24 11:18:31 +0000
@@ -23,4 +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
+0001-gtkwindow-set-transparent-background-color.patch