← Back to branch summary

~gnome3-team/gnome-screensaver/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/16_dont_crash_in_kvm.patch

  • Committer: Robert Ancell
  • Date: 2010-12-08 04:40:34 UTC
  • Revision ID: robert.ancell@canonical.com-20101208044034-oxr91iinkcn9xfn6
* New upstream release
* debian/control:
  - Bump build-depends on libgtk3.0-dev, libgnome-desktop-3-dev,
    libgnotify4-dev
  - Use standards-version 3.9.1
  - Update Vcs-Bzr link
* debian/patches/00git_gnome_bg.patch:
* debian/patches/00git_gnome_rr.patch:
* debian/patches/00git_size_request.patch:
  - Git patches to build against latest GTK+ and libgnome-desktop

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16_dont_crash_in_kvm.patch
10
10
Forwarded: https://bugzilla.gnome.org/attachment.cgi?id=161276
11
11
Author: Chris Coulson <chris.coulson@canonical.com>
12
12
 
13
 
Index: gnome-screensaver-2.30.2/src/gs-fade.c
 
13
Index: gnome-screensaver-2.91.0/src/gs-fade.c
14
14
===================================================================
15
 
--- gnome-screensaver-2.30.2.orig/src/gs-fade.c 2010-11-15 16:35:43.078663002 +1100
16
 
+++ gnome-screensaver-2.30.2/src/gs-fade.c      2010-11-15 16:37:45.814662558 +1100
 
15
--- gnome-screensaver-2.91.0.orig/src/gs-fade.c 2010-12-08 14:44:25.637450001 +1100
 
16
+++ gnome-screensaver-2.91.0/src/gs-fade.c      2010-12-08 14:46:38.785450528 +1100
17
17
@@ -208,7 +208,13 @@
18
18
                         g2.blue = XF86_MIN_GAMMA;
19
19
                 }
20
20
 
21
 
+                gdk_error_trap_push ();
22
 
                 status = XF86VidModeSetGamma (GDK_DISPLAY (), screen, &g2);
 
21
+                gdk_error_trap_push ();           
 
22
                 status = XF86VidModeSetGamma (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, &g2);
23
23
+                gdk_flush ();
24
24
+                if (gdk_error_trap_pop ()) {
25
25
+                        gs_debug ("Failed to set gamma. Bailing out and aborting fade");
33
33
                 }
34
34
 
35
35
+                gdk_error_trap_push ();
36
 
                 status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, gamma_info->size, r, g, b);
 
36
                 status = XF86VidModeSetGammaRamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, gamma_info->size, r, g, b);
37
37
+                gdk_flush ();
38
38
+                if (gdk_error_trap_pop ()) {
39
39
+                        gs_debug ("Failed to set gamma. Bailing out and aborting fade");
40
 
+                        return FALSE;                
 
40
+                        return FALSE;        
41
41
+                }
42
42
 
43
43
                 g_free (r);