[fusion-commits] compiz mirror: Changes to 'master' (f996780eefb53831f58c7c7a86c4e9856057da3e)

[compiz at server.beryl-project.org]

New commits:
commit f996780eefb53831f58c7c7a86c4e9856057da3e
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 31 14:08:03 2007 -0400

    Add missing NULL check.

commit 6d262db179816524849ea303378cd86aad80651b
Author: Roland Baer <roland at Vista.(none)>
Date:   Tue Jul 31 13:45:04 2007 +0300

    Removed useless test


 src/screen.c |    2 +-
 src/window.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


Modified: compiz/src/screen.c
===================================================================
--- compiz/src/screen.c
+++ compiz/src/screen.c
@@ -1189,7 +1189,7 @@ getDesktopHints (CompScreen *s)
 	memcpy (data, propData, sizeof (unsigned long));
 	XFree (propData);
 
-	if (data[0] >= 0 && data[0] < s->nDesktop)
+	if (data[0] < s->nDesktop)
 	    s->currentDesktop = data[0];
     }
 

Modified: compiz/src/window.c
===================================================================
--- compiz/src/window.c
+++ compiz/src/window.c
@@ -1746,7 +1746,11 @@ updateWindowStruts (CompWindow *w)
 	if (hasNew)
 	{
 	    if (!w->struts)
+	    {
 		w->struts = malloc (sizeof (CompStruts));
+		if (!w->struts)
+		    return FALSE;
+	    }
 
 	    *w->struts = new;
 	}