Merge lp://qastaging/~3v1n0/ubuntu/vivid/libcanberra/fix-mir-crash into lp://qastaging/ubuntu/vivid/libcanberra
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Sebastien Bacher | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~3v1n0/ubuntu/vivid/libcanberra/fix-mir-crash | ||||
| Merge into: | lp://qastaging/ubuntu/vivid/libcanberra | ||||
| Diff against target: |
1704 lines (+1628/-0) 8 files modified
.pc/05_gtk_dont_assume_all_gdkdisplays_are_gdkx11displays.patch/src/canberra-gtk-module.c (+990/-0) .pc/05_gtk_dont_assume_all_gdkdisplays_are_gdkx11displays.patch/src/canberra-gtk.c (+544/-0) .pc/applied-patches (+1/-0) debian/changelog (+7/-0) debian/patches/05_gtk_dont_assume_all_gdkdisplays_are_gdkx11displays.patch (+65/-0) debian/patches/series (+1/-0) src/canberra-gtk-module.c (+15/-0) src/canberra-gtk.c (+5/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/ubuntu/vivid/libcanberra/fix-mir-crash | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Commit message
gtk: don't assume all GdkDisplay's are GdkX11Display's
Fixes crash on Mir.
Description of the change
Backporting upstream commit to ubuntu, to get canberra properly work in Mir.
http://
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, but isn't our package built with a version of GTK which has that define set?