Gentoo Archives: gentoo-commits

From: "Mart Raudsepp (leio)" <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-screensaver/files: gnome-screensaver-2.20.0-fix-gamma.patch
Date: Thu, 21 Feb 2008 14:04:29
Message-Id: E1JSC2F-0006bW-6H@stork.gentoo.org
1 leio 08/02/21 14:04:27
2
3 Added: gnome-screensaver-2.20.0-fix-gamma.patch
4 Log:
5 Improve gamma restoring, bug 201019. Thanks to Pacho Ramos
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch?rev=1.1&content-type=text/plain
13
14 Index: gnome-screensaver-2.20.0-fix-gamma.patch
15 ===================================================================
16 http://bugzilla.gnome.org/show_bug.cgi?id=342850
17 http://bugs.gentoo.org/show_bug.cgi?id=201019
18
19 Index: src/gs-fade.c
20 ===================================================================
21 --- src/gs-fade.c (revision 1322)
22 +++ src/gs-fade.c (working copy)
23 @@ -296,6 +296,10 @@
24 }
25 # endif
26
27 + if (fade->priv->gamma_info) {
28 + return TRUE;
29 + }
30 +
31 info = g_new0 (xf86_gamma_info, fade->priv->num_screens);
32 fade->priv->gamma_info = info;
33
34 @@ -402,8 +406,10 @@
35 int screen;
36 gboolean res;
37
38 - for (screen = 0; screen < fade->priv->num_screens; screen++) {
39 - res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
40 + if (fade->priv->gamma_info) {
41 + for (screen = 0; screen < fade->priv->num_screens; screen++) {
42 + res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
43 + }
44 }
45
46 return TRUE;
47 @@ -523,6 +529,8 @@
48
49 g_return_if_fail (GS_IS_FADE (fade));
50
51 + gamma_info_init (fade);
52 +
53 if (fade->priv->timer_id > 0) {
54 gs_fade_stop (fade);
55 }
56 @@ -641,6 +649,8 @@
57 fade->priv->current_alpha = 1.0;
58
59 gs_fade_set_alpha (fade, fade->priv->current_alpha);
60 +
61 + gamma_info_free (fade);
62 }
63
64 static void
65 @@ -681,7 +691,9 @@
66 display = gdk_display_get_default ();
67 fade->priv->num_screens = gdk_display_get_n_screens (display);
68
69 - gamma_info_init (fade);
70 +#ifdef HAVE_XF86VMODE_GAMMA
71 + fade->priv->gamma_info = NULL;
72 +#endif
73 }
74
75 static void
76
77
78
79 --
80 gentoo-commits@l.g.o mailing list