Merge lp://staging/~muktupavels/compiz/gwd-support-metacity-3-20 into lp://staging/compiz/0.9.12
Proposed by
Alberts Muktupāvels
| Status: | Merged |
|---|---|
| Approved by: | Marco Trevisan (Treviño) |
| Approved revision: | 4047 |
| Merged at revision: | 4059 |
| Proposed branch: | lp://staging/~muktupavels/compiz/gwd-support-metacity-3-20 |
| Merge into: | lp://staging/compiz/0.9.12 |
| Prerequisite: | lp://staging/~muktupavels/compiz/gwd-improve-metacity |
| Diff against target: |
587 lines (+198/-10) 6 files modified
gtk/CMakeLists.txt (+19/-4) gtk/config.h.gtk.in (+3/-0) gtk/window-decorator/gtk-window-decorator.c (+2/-0) gtk/window-decorator/gwd-settings-storage.c (+67/-2) gtk/window-decorator/gwd-theme-metacity.c (+107/-3) gtk/window-decorator/gwd-theme.c (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~muktupavels/compiz/gwd-support-metacity-3-20 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Trevisan (Treviño) | Approve | ||
|
Review via email:
|
|||
Commit message
gtk-window-
Description of the change
Support Metacity 3.20.
To post a comment you must log in.
Revision history for this message
| Sam Spilsbury (smspillaz) | # |
Revision history for this message
| Alberts Muktupāvels (muktupavels) wrote | # |
Revision history for this message
| Marco Trevisan (Treviño) (3v1n0) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
"These members aren't strictly dependent on having megacity 3.20 around, so the ifdefs are probably not necessary here."
style_variants and titlebar_font is not used with Metacity 3.20. So there is no need to create and later destroy hash table. Also ifdefs was added to make sure that I don't try to use them with 3.20.