diff -u compiz-0.9.9~daily13.06.19~13.04/debian/changelog compiz-0.9.9~daily13.06.19~13.04/debian/changelog --- compiz-0.9.9~daily13.06.19~13.04/debian/changelog +++ compiz-0.9.9~daily13.06.19~13.04/debian/changelog @@ -1,3 +1,11 @@ +compiz (1:0.9.9~daily13.06.19~13.04-0ubuntu1+bug1158267.0) raring; urgency=low + + * Apply decor patch from + https://bazaar.launchpad.net/~mar-kolya/compiz/fix-for-1158267/revision/3734 + (LP: #1158267) + + -- a7x Sat, 06 Jul 2013 18:49:38 -0400 + compiz (1:0.9.9~daily13.06.19~13.04-0ubuntu1) raring; urgency=low [ Chris Townsend ] diff -u compiz-0.9.9~daily13.06.19~13.04/debian/patches/series compiz-0.9.9~daily13.06.19~13.04/debian/patches/series --- compiz-0.9.9~daily13.06.19~13.04/debian/patches/series +++ compiz-0.9.9~daily13.06.19~13.04/debian/patches/series @@ -9,0 +10 @@ +bug1158267.patch only in patch2: unchanged: --- compiz-0.9.9~daily13.06.19~13.04.orig/debian/patches/bug1158267.patch +++ compiz-0.9.9~daily13.06.19~13.04/debian/patches/bug1158267.patch @@ -0,0 +1,37 @@ +=== modified file 'plugins/decor/src/decor.cpp' +--- a/plugins/decor/src/decor.cpp ++++ b/plugins/decor/src/decor.cpp +@@ -1669,6 +1669,16 @@ + */ + if (decoration) + { ++ wd = WindowDecoration::create (decoration); ++ if (!wd) ++ { ++ /* Error condition, reset frame extents */ ++ CompWindowExtents emptyExtents; ++ memset (&emptyExtents, 0, sizeof (CompWindowExtents)); ++ window->setWindowFrameExtents (&emptyExtents, &emptyExtents); ++ return false; ++ } ++ + /* Set extents based on maximize/unmaximize state + * FIXME: With the new type system, this should be + * removed */ +@@ -1684,16 +1694,6 @@ + if (decorate || + shadowOnly) + { +- wd = WindowDecoration::create (decoration); +- if (!wd) +- { +- /* Error condition, reset frame extents */ +- CompWindowExtents emptyExtents; +- memset (&emptyExtents, 0, sizeof (CompWindowExtents)); +- window->setWindowFrameExtents (&emptyExtents, &emptyExtents); +- return false; +- } +- + movement = cwe::shift (window->border (), window->sizeHints ().win_gravity); + movement -= oldShift; +