← Back to branch summary

~hypodermia/ubuntu/oneiric/compiz/fix-for-bug-301174

« back to all changes in this revision

Viewing changes to src/screen.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-04-11 13:25:14 UTC
  • mfrom: (0.168.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20110411132514-h13c20xw827l6ekl
Tags: 1:0.9.4+bzr20110411-0ubuntu1
https://launchpad.net/bugs/743807
https://launchpad.net/bugs/754088
https://launchpad.net/bugs/753051
* New upstream snapshot, including all 01_bzr* patch:
  - compiz crashed with SIGSEGV in PluginClassHandler<DecorWindow, CompWindow,
    0>::get() (LP: #743807)
  - Animation for Grid Previews is broken (LP: #754088)
  - Grid plugin: Maximizing a window from left or right edge loses original
    size (LP: #753051)
* add 00_remove_printf.patch: remove debug printf
* 02_add_debug_spewer_for_apport.patch:
  - refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/screen.cpp
665
665
        screen->insertWindow (w, screen->windows ().size () ?
666
666
                                  screen->windows ().back ()->id () : 0);
667
667
 
 
668
    if (children)
 
669
        XFree (children);
 
670
 
668
671
    return true;
669
672
}
670
673
 
4693
4696
            priv->setDefaultWindowAttributes (&attrib);
4694
4697
 
4695
4698
        CoreWindow *cw = new CoreWindow (children[i]);
 
4699
        cw->manage (i ? children[i - 1] : 0, attrib);
4696
4700
 
4697
 
        if (cw)
4698
 
        {
4699
 
            cw->manage (i ? children[i - 1] : 0, attrib);
4700
 
            priv->createdWindows.remove (cw);
4701
 
            delete cw;
4702
 
        }
 
4701
        priv->createdWindows.remove (cw);
 
4702
        delete cw;
4703
4703
    }
4704
4704
 
4705
4705
    i = 0;