~timo-jyrinki/compiz/metacity-key-migrations

« back to all changes in this revision

Viewing changes to kde/window-decorator-kde4/switcher.cpp

Reduced the scope of the variable 'icccm_version', removed a break that can never be executed, added the variables 'frameType', 'frameState' and 'frameActions' to decor_quads_to_property in the #else branch in KWD::Switcher::updateWindowProperties () as well and simplified calc_button_size (decor_t *d) in cairo.c.. Fixes: https://bugs.launchpad.net/bugs/1030473. Approved by Daniel van Vugt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
248
248
    decor_quads_to_property (data, nOffset - 1, mPixmap.handle (),
249
249
                             &mBorder, &mBorder, &mBorder, &mBorder,
250
250
                             0, 0,
251
 
                             quads, nQuad);
 
251
                             quads, nQuad, frameType, frameState, frameActions);
252
252
#endif
253
253
    KWD::trapXError ();
254
254
    XChangeProperty (QX11Info::display (), mId, Atoms::netWindowDecor,