← Back to branch summary

~smspillaz/compiz-core/compiz-core.geometry-tests

« back to all changes in this revision

Viewing changes to src/window.cpp

  • Committer: Sam Spilsbury
  • Date: 2011-09-30 04:53:55 UTC
  • mfrom: (2844.6.6 compiz-core)
  • Revision ID: sam.spilsbury@canonical.com-20110930045355-yeq38seh70vnujm4
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/window.cpp
1455
1455
        priv->id = 0;
1456
1456
        priv->frame = 0;
1457
1457
        priv->serverFrame = 0;
 
1458
        priv->managed    = false;
1458
1459
    }
1459
1460
 
1460
1461
    priv->destroyRefCnt--;
3451
3452
            }
3452
3453
        }
3453
3454
    }
3454
 
    else
 
3455
    else if (priv->id)
3455
3456
    {
3456
3457
        priv->reconfigureXWindow (valueMask, xwc);
3457
3458
    }
3991
3992
         * if serverPrev was recently restacked */
3992
3993
        if (window->serverPrev)
3993
3994
        {
3994
 
            if (!sibling)
 
3995
            if (!sibling && id)
3995
3996
            {
3996
3997
                XWindowChanges lxwc;
3997
3998
                unsigned int   valueMask = CWStackMode;