Compiz Core

Merge lp:~sil2100/compiz-core/cherry_3241 into lp:compiz-core

  1. cherry_3241
  2. Merge into 0.9.7
Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 3107
Proposed branch: lp:~sil2100/compiz-core/cherry_3241
Merge into: lp:compiz-core
Diff against target: 26 lines (+10/-6)
1 file modified
gtk/window-decorator/wnck.c (+10/-6)
To merge this branch: bzr merge lp:~sil2100/compiz-core/cherry_3241
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+111216@code.launchpad.net

Commit message

Cherry-picked from compiz trunk (rev 3241):
Check if the window is decorated before trying to change its event window states (which won't exist if not decorated) (LP: #1007754)

Description of the change

Cherry-picked from trunk:

Check if the window is decorated before trying to change its event window states (which won't exist if not decorated)

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/window-decorator/wnck.c'
2--- gtk/window-decorator/wnck.c 2012-06-15 16:41:34 +0000
3+++ gtk/window-decorator/wnck.c 2012-06-20 12:54:20 +0000
4@@ -419,12 +419,16 @@
5 GINT_TO_POINTER (frame),
6 GINT_TO_POINTER (xid));
7 }
8- update_window_decoration_state (win);
9- update_window_decoration_actions (win);
10- update_window_decoration_icon (win);
11- request_update_window_decoration_size (win);
12-
13- update_event_windows (win);
14+
15+ if (d->decorated)
16+ {
17+ update_window_decoration_state (win);
18+ update_window_decoration_actions (win);
19+ update_window_decoration_icon (win);
20+ request_update_window_decoration_size (win);
21+
22+ update_event_windows (win);
23+ }
24 }
25 else
26 {

Subscribers

People subscribed via source and target branches