diff -u compiz-0.7.8/debian/changelog compiz-0.7.8/debian/changelog
--- compiz-0.7.8/debian/changelog
+++ compiz-0.7.8/debian/changelog
@@ -1,3 +1,10 @@
+compiz (1:0.7.8-0ubuntu4) intrepid; urgency=low
+
+  * Reenable an updated 030_fix_screensaver to prevent "unredirect fullscreen
+    windows" option from waking up gnome-screensaver (fixes LP: #278112)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Wed, 15 Oct 2008 14:45:59 +0200
+
 compiz (1:0.7.8-0ubuntu3) intrepid; urgency=low
 
   * debian/rules:
diff -u compiz-0.7.8/debian/patches/030_fix_screensaver compiz-0.7.8/debian/patches/030_fix_screensaver
--- compiz-0.7.8/debian/patches/030_fix_screensaver
+++ compiz-0.7.8/debian/patches/030_fix_screensaver
@@ -1,8 +1,24 @@
-Index: ubuntu/src/screen.c
+Index: compiz-0.7.8/src/paint.c
 ===================================================================
---- ubuntu.orig/src/screen.c	2008-04-03 09:54:30.000000000 +0200
-+++ ubuntu/src/screen.c	2008-04-03 10:05:28.000000000 +0200
-@@ -2516,7 +2516,8 @@
+--- compiz-0.7.8.orig/src/paint.c	2008-10-15 12:21:51.000000000 +0200
++++ compiz-0.7.8/src/paint.c	2008-10-15 13:53:08.000000000 +0200
+@@ -347,7 +347,10 @@
+ 		    if (XEqualRegion (w->region, &screen->region) &&
+ 			!REGION_NOT_EMPTY (tmpRegion))
+ 		    {
+-			fullscreenWindow = w;
++		        if ( ! w->resName || strcmp(w->resName,"gnome-screensaver") != 0 )
++		        {
++		            fullscreenWindow = w;
++		        }
+ 		    }
+ 		    else
+ 		    {
+Index: compiz-0.7.8/src/screen.c
+===================================================================
+--- compiz-0.7.8.orig/src/screen.c	2008-10-15 13:53:33.000000000 +0200
++++ compiz-0.7.8/src/screen.c	2008-10-15 13:55:06.000000000 +0200
+@@ -2554,7 +2554,8 @@
  	    for (w = s->windows; w; w = w->next)
  		if (w->frame == id)
  		    return w;
@@ -15,14 +30,0 @@
-Index: ubuntu/src/paint.c
-===================================================================
---- ubuntu.orig/src/paint.c	2008-03-12 19:00:46.000000000 +0100
-+++ ubuntu/src/paint.c	2008-04-03 10:06:47.000000000 +0200
-@@ -247,7 +247,8 @@
- 
- 	    /* unredirect top most fullscreen windows. */
- 	    if (count == 0 &&
--		screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b)
-+		screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b &&
-+		!(w->resName && strcmp(w->resName, "gnome-screensaver") == 0))
- 	    {
- 		if (XEqualRegion (w->region, &screen->region) &&
- 		    !REGION_NOT_EMPTY (tmpRegion))
diff -u compiz-0.7.8/debian/patches/series compiz-0.7.8/debian/patches/series
--- compiz-0.7.8/debian/patches/series
+++ compiz-0.7.8/debian/patches/series
@@ -17,7 +17,7 @@
 029_compiz_manager_decoration.patch
 029_compiz_manager_nvidia_settings.patch
 029_default_options
-#030_fix_screensaver
+030_fix_screensaver
 031_add_compiz_common.patch
 032_compiz_manager_default_window_manager.patch
 #033_honor_default_plugins