← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-screensaver/maverick

« back to all changes in this revision

Viewing changes to src/gs-fade.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-09-23 12:54:12 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20090923125412-thw2xjbm00cilt2w
Tags: 2.28.0-0ubuntu1
https://launchpad.net/bugs/357494
* New upstream version
  Fixed bugs:
  - #444927, get idle time from xorg (lp: #357494)
  - #463010, Port gnome-screensaver from libglade to gtkbuilder
  - #564061, Install .desktop file
  - #570402, screensaver crash if number of screens changes
  - #570941, String not marked for translation gnome-screensaver-command.c
  - #574896, [Leave message] Cancel button should clean clipboard buffe
  - #576463, can't unlock screen after upgrade until restarting 
             gnome-screensaver
  - #581995, Fade out doesn't properly fall back to gamma number if X server
             only supports 0-size ramp
  - #586174, Encoding key in desktop files is deprecated
  - #589728, gnome-screensaver: implicit declaration g_printf
  - #590776, screensaver is never activated
  - #591193, Update/Create .gitignore
  - #591194, Add Comment and Icon in gnome-screensaver.desktop
  - #594082, gnome-screensaver ignores input when fading to black
  Translators
* debian/control.in:
  - don't use libglade
* debian/patches/06_unbreak_upgrade_from_jaunty.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gs-fade.c
308
308
        */
309
309
        for (screen = 0; screen < fade->priv->num_screens; screen++) {
310
310
 
311
 
                if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) {
312
 
                        /* only have gamma parameter, not ramps. */
313
 
 
314
 
                        res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg);
315
 
                        if (! res) {
316
 
                                goto FAIL;
317
 
                        }
318
 
                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
319
 
                                  screen,
320
 
                                  info [screen].vmg.red,
321
 
                                  info [screen].vmg.green,
322
 
                                  info [screen].vmg.blue);
323
 
                }
324
 
 
325
311
# ifdef HAVE_XF86VMODE_GAMMA_RAMP
326
312
 
327
 
                else if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
 
313
                if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
328
314
                        /* have ramps */
329
315
 
330
316
                        res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen, &info [screen].size);
331
 
                        if (! res) {
332
 
                                goto FAIL;
333
 
                        }
334
 
 
335
 
                        if (info [screen].size <= 0) {
336
 
                                goto FAIL;
 
317
                        if (! res || info [screen].size <= 0) {
 
318
                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
 
319
                                goto test_number;
337
320
                        }
338
321
 
339
322
                        info [screen].r = g_new0 (unsigned short, info[screen].size);
341
324
                        info [screen].b = g_new0 (unsigned short, info[screen].size);
342
325
 
343
326
                        if (! (info [screen].r && info [screen].g && info [screen].b)) {
344
 
                                goto FAIL;
 
327
                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
 
328
                                goto test_number;
345
329
                        }
346
330
 
347
331
                        res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
351
335
                                                       info [screen].g,
352
336
                                                       info [screen].b);
353
337
                        if (! res) {
354
 
                                goto FAIL;
 
338
                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
 
339
                                goto test_number;
355
340
                        }
356
341
                        gs_debug ("Initialized gamma ramp fade");
357
342
                }
358
343
# endif /* HAVE_XF86VMODE_GAMMA_RAMP */
359
 
                else if (FADE_TYPE_NONE == fade->priv->fade_type) {
 
344
 
 
345
 test_number:
 
346
                if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) {
 
347
                        /* only have gamma parameter, not ramps. */
 
348
 
 
349
                        res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg);
 
350
                        if (! res) {
 
351
                                fade->priv->fade_type = FADE_TYPE_NONE;
 
352
                                goto test_none;
 
353
                        }
 
354
                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
 
355
                                  screen,
 
356
                                  info [screen].vmg.red,
 
357
                                  info [screen].vmg.green,
 
358
                                  info [screen].vmg.blue);
 
359
                }
 
360
 
 
361
 test_none:
 
362
                if (FADE_TYPE_NONE == fade->priv->fade_type) {
360
363
                        goto FAIL;
361
 
                } else {
362
 
                        g_assert_not_reached ();
363
364
                }
364
365
        }
365
366