compiz-fusion-bcop: Changes to 'upstream-unstable'

[Sean Finney <seanius@alioth.debian.org>]

 VERSION       |    2 +-
 src/bcop.xslt |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 1ac65736c1eb23f4cf18eb2f12fe3e889b152f47
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Wed Oct 14 04:08:57 2009 +0200

    * Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4

commit 379b43fe0ab2665c942ffa2d14fc4228f533401c
Author: Dennis Kasprzyk <onestone@compiz-fusion.org>
Date:   Thu Aug 27 18:36:40 2009 +0200

    Don't return Options if Screen/Display has been freed.

diff --git a/src/bcop.xslt b/src/bcop.xslt
index 8f169d6..6976df2 100644
--- a/src/bcop.xslt
+++ b/src/bcop.xslt
@@ -723,6 +723,11 @@ void </xsl:text>
     </xsl:text>
         <xsl:value-of select="$PLUGIN"/>
         <xsl:text>_OPTIONS_DISPLAY(d);
+    if (!od)
+    {
+        *count = 0;
+        return NULL;
+    }
     *count = </xsl:text>
         <xsl:value-of select="$Plugin"/>
         <xsl:text>DisplayOptionNum;
@@ -740,6 +745,11 @@ void </xsl:text>
     </xsl:text>
         <xsl:value-of select="$PLUGIN"/>
         <xsl:text>_OPTIONS_SCREEN(s);
+    if (!os)
+    {
+        *count = 0;
+        return NULL;
+    }
     *count = </xsl:text>
         <xsl:value-of select="$Plugin"/>
         <xsl:text>ScreenOptionNum;
@@ -955,6 +965,9 @@ static void </xsl:text>
     </xsl:text>
         <xsl:value-of select="$PLUGIN"/>
         <xsl:text>_OPTIONS_SCREEN (s);
+    </xsl:text>
+    <xsl:value-of select="$PLUGIN"/>
+        <xsl:text>_OPTIONS_DISPLAY (s->display);
 
 </xsl:text>
         <xsl:if test="/compiz/plugin[@name=$pName]/screen/descendant-or-self::option">
@@ -966,6 +979,7 @@ static void </xsl:text>
 </xsl:text>
         </xsl:if>
         <xsl:text>    free (os);
+    s->base.privates[od->screenPrivateIndex].ptr = NULL;
 }
 
 </xsl:text>
@@ -1067,6 +1081,9 @@ static void </xsl:text>
 </xsl:text>
         </xsl:if>
         <xsl:text>    free (od);
+    d->base.privates[</xsl:text>
+        <xsl:value-of select="$Plugin"/>
+        <xsl:text>OptionsDisplayPrivateIndex].ptr = NULL;
 }
 
 </xsl:text>

commit a6ae8e25a17e408dcbe8b31f42754c06b83d23c3
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Mon Mar 9 15:43:44 2009 +0100

    * Bump version to 0.8.3

diff --git a/VERSION b/VERSION
index 2dcc312..9b265c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.2
+VERSION=0.8.3