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

Proposed by Alberts Muktupāvels on 2015-02-18
Status: Merged
Merged at revision: 141
Proposed branch: lp:~muktupavels/metacity/lp1403583
Merge into: lp:ubuntu/vivid/metacity
Diff against target: 74 lines (+54/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/compositor-don-t-use-invalid-back_pixmap.patch (+46/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~muktupavels/metacity/lp1403583
Reviewer Review Type Date Requested Status
Dmitry Shachnev 2015-02-18 Approve on 2015-02-18
Review via email: mp+250136@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

YES, this patch fixes the issue. Thanks!

review: Approve
Alberts Muktupāvels (muktupavels) wrote :

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

Dmitry Shachnev (mitya57) wrote :

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

Dmitry Shachnev (mitya57) wrote :

Uploaded, sorry for the delay.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-01-31 15:59:33 +0000
3+++ debian/changelog 2015-02-18 14:24:40 +0000
4@@ -1,3 +1,10 @@
5+metacity (1:3.14.3-1ubuntu5) UNRELEASED; urgency=medium
6+
7+ * debian/patches/compositor-don-t-use-invalid-back_pixmap.patch:
8+ Don't use invalid back_pixmap. (LP: #1403583)
9+
10+ -- Alberts Muktupāvels <alberts.muktupavels@gmail.com> Wed, 18 Feb 2015 16:11:17 +0200
11+
12 metacity (1:3.14.3-1ubuntu4) vivid; urgency=medium
13
14 * Backport upstream patch to use correct name for missing icon,
15
16=== added file 'debian/patches/compositor-don-t-use-invalid-back_pixmap.patch'
17--- debian/patches/compositor-don-t-use-invalid-back_pixmap.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/compositor-don-t-use-invalid-back_pixmap.patch 2015-02-18 14:24:40 +0000
19@@ -0,0 +1,46 @@
20+Description: compositor: don't use invalid back_pixmap
21+Author: Alberts Muktupāvels <alberts.muktupavels@gmail.com>
22+Bug: https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/1403583
23+
24+--- a/src/compositor/compositor-xrender.c
25++++ b/src/compositor/compositor-xrender.c
26+@@ -1061,17 +1061,22 @@
27+ XRenderPictureAttributes pa;
28+ XRenderPictFormat *format;
29+ Drawable draw;
30++ int error_code;
31+
32+ draw = cw->id;
33+
34+- meta_error_trap_push (display);
35+-
36+ #ifdef HAVE_NAME_WINDOW_PIXMAP
37+ if (have_name_window_pixmap (display))
38+ {
39++ meta_error_trap_push (display);
40++
41+ if (cw->back_pixmap == None)
42+ cw->back_pixmap = XCompositeNameWindowPixmap (xdisplay, cw->id);
43+
44++ error_code = meta_error_trap_pop_with_return (display, FALSE);
45++ if (error_code != 0)
46++ cw->back_pixmap = None;
47++
48+ if (cw->back_pixmap != None)
49+ draw = cw->back_pixmap;
50+ }
51+@@ -1084,13 +1089,13 @@
52+
53+ pa.subwindow_mode = IncludeInferiors;
54+
55++ meta_error_trap_push (display);
56+ pict = XRenderCreatePicture (xdisplay, draw, format, CPSubwindowMode, &pa);
57+ meta_error_trap_pop (display, FALSE);
58+
59+ return pict;
60+ }
61+
62+- meta_error_trap_pop (display, FALSE);
63+ return None;
64+ }
65+
66
67=== modified file 'debian/patches/series'
68--- debian/patches/series 2015-01-31 15:59:33 +0000
69+++ debian/patches/series 2015-02-18 14:24:40 +0000
70@@ -2,3 +2,4 @@
71 fix_switch_applications.patch
72 keycode_to_keysym.patch
73 missing_icon.patch
74+compositor-don-t-use-invalid-back_pixmap.patch

Subscribers

People subscribed via source and target branches