Merge lp:~muktupavels/metacity/lp1403583 into lp:ubuntu/vivid/metacity

[Alberts Muktupāvels]

Fix notify-osd notifications. (LP: #1403583)

Fix notify-osd notifications. (LP: #1403583)

[Dmitry Shachnev (mitya57)]

YES, this patch fixes the issue. Thanks!

review: Approve

[Alberts Muktupāvels (muktupavels)]

Are you going to upload this to vivid? Or you are waiting for something?

[Dmitry Shachnev (mitya57)]

Just have not yet had time for it. Will try to upload this week.

[Dmitry Shachnev (mitya57)]

Uploaded, sorry for the delay.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-31 15:59:33 +0000
+++ debian/changelog	2015-02-18 14:24:40 +0000
@@ -1,3 +1,10 @@
+metacity (1:3.14.3-1ubuntu5) UNRELEASED; urgency=medium
+
+  * debian/patches/compositor-don-t-use-invalid-back_pixmap.patch:
+    Don't use invalid back_pixmap. (LP: #1403583)
+
+ -- Alberts Muktupāvels <[e-mail]>  Wed, 18 Feb 2015 16:11:17 +0200
+
 metacity (1:3.14.3-1ubuntu4) vivid; urgency=medium
 
   * Backport upstream patch to use correct name for missing icon,

=== added file 'debian/patches/compositor-don-t-use-invalid-back_pixmap.patch'
--- debian/patches/compositor-don-t-use-invalid-back_pixmap.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/compositor-don-t-use-invalid-back_pixmap.patch	2015-02-18 14:24:40 +0000
@@ -0,0 +1,46 @@
+Description: compositor: don't use invalid back_pixmap
+Author: Alberts Muktupāvels <[e-mail]>
+Bug: https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/1403583
+
+--- a/src/compositor/compositor-xrender.c
++++ b/src/compositor/compositor-xrender.c
+@@ -1061,17 +1061,22 @@
+   XRenderPictureAttributes pa;
+   XRenderPictFormat *format;
+   Drawable draw;
++  int error_code;
+ 
+   draw = cw->id;
+ 
+-  meta_error_trap_push (display);
+-
+ #ifdef HAVE_NAME_WINDOW_PIXMAP
+   if (have_name_window_pixmap (display))
+     {
++      meta_error_trap_push (display);
++
+       if (cw->back_pixmap == None)
+         cw->back_pixmap = XCompositeNameWindowPixmap (xdisplay, cw->id);
+ 
++      error_code = meta_error_trap_pop_with_return (display, FALSE);
++      if (error_code != 0)
++        cw->back_pixmap = None;
++
+       if (cw->back_pixmap != None)
+         draw = cw->back_pixmap;
+     }
+@@ -1084,13 +1089,13 @@
+ 
+       pa.subwindow_mode = IncludeInferiors;
+ 
++      meta_error_trap_push (display);
+       pict = XRenderCreatePicture (xdisplay, draw, format, CPSubwindowMode, &pa);
+       meta_error_trap_pop (display, FALSE);
+ 
+       return pict;
+     }
+ 
+-  meta_error_trap_pop (display, FALSE);
+   return None;
+ }
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-31 15:59:33 +0000
+++ debian/patches/series	2015-02-18 14:24:40 +0000
@@ -2,3 +2,4 @@
 fix_switch_applications.patch
 keycode_to_keysym.patch
 missing_icon.patch
+compositor-don-t-use-invalid-back_pixmap.patch