~ubuntu-branches/ubuntu/lucid/gnome-screensaver/lucid

Committer: Bazaar Package Importer
Author(s): Chris Coulson
Date: 2010-02-17 19:55:37 UTC
mfrom: (1.1.35 upstream)
Revision ID: james.westby@ubuntu.com-20100217195537-gfdc7c8l1v2o10e6

Tags: 2.29.91-0ubuntu1

* New upstream version.
* Fixed bugs:
  - CVE-2010-0422, handle monitor hotplugging more securely
  - Fix screen dirt in floaters screensaver
* Refreshed patches:
  - 04_force_blank_only_on_ltsp.patch
  - 05_locking_for_compiz.patch
* debian/patches/13_nvidia_gamma_fade_fallback.patch:
  - Updated tags with upstream bug number now I've sent it upstream.

Show diffs side-by-side

added added

removed removed

src/gs-manager.c

#include <time.h>

#include <gdk/gdk.h>

#include <gdk/gdkx.h>

#include <gconf/gconf-engine.h>

#include <gconf/gconf-client.h>

1490

1491

n_monitors);

1491

1492

1493

if (n_monitors > n_windows) {

1494

1495

/* Tear down unlock dialog in case we want to move it

1496

* to a new monitor

1497

1498

l = manager->priv->windows;

1499

while (l != NULL) {

1500

gs_window_cancel_unlock_request (GS_WINDOW (l->data));

1501

l = l->next;

1502

}

1503

1493

1504

/* add more windows */

1494

1505

for (i = n_windows; i < n_monitors; i++) {

1495

1506

gs_manager_create_window_for_monitor (manager, screen, i);

1496

1507

}

1508

1509

/* And put unlock dialog up where ever it's supposed to be

1510

1511

gs_manager_request_unlock (manager);

1497

1512

} else {

1498

1513

1499

1514

gdk_x11_grab_server ();

Older »