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

« back to all changes in this revision

Viewing changes to gtk/window-decorator/cairo.c

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:
716
716
static void
717
717
calc_button_size (decor_t *d)
718
718
{
719
 
    gint button_width;
720
 
 
721
 
    button_width = 0;
 
719
    gint button_width = 0;
722
720
 
723
721
    if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
724
722
        button_width += 17;
729
727
                      WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY))
730
728
        button_width += 17;
731
729
 
732
 
    if (d->actions & (WNCK_WINDOW_ACTION_MINIMIZE |
733
 
                      WNCK_WINDOW_ACTION_MINIMIZE))
 
730
    if (d->actions & WNCK_WINDOW_ACTION_MINIMIZE)
734
731
        button_width += 17;
735
732
 
736
733
    if (button_width)