~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-window-x11.c

1023

{

1024

g_return_if_fail (GS_IS_WINDOW (window));

1025

1026

if (window->priv->lock_pid > 0) {

1027

gs_window_dialog_finish (window);

1028

}

1029

1030

remove_popup_dialog_idle (window);

1031

remove_command_watches (window);

1032

remove_watchdog_timer (window);

1033

1034

if (window->priv->lock_box != NULL) {

1035

gtk_container_remove (GTK_CONTAINER (window->priv->vbox), GTK_WIDGET (window->priv->lock_box));

1036

window->priv->lock_box = NULL;

1037

1038

g_signal_emit (window, signals [DIALOG_DOWN], 0);

1039

}

1026

gs_window_cancel_unlock_request (window);

1040

1027

1041

1028

gtk_widget_destroy (GTK_WIDGET (window));

1042

1029

}

1765

1752

}

1766

1753

1767

1754

if (window->priv->lock_pid > 0) {

1768

kill (window->priv->lock_pid, SIGTERM);

1755

gs_window_dialog_finish (window);

1756

}

1757

1758

remove_popup_dialog_idle (window);

1759

remove_command_watches (window);

1760

remove_watchdog_timer (window);

1761

1762

if (window->priv->lock_box != NULL) {

1763

gtk_container_remove (GTK_CONTAINER (window->priv->vbox), GTK_WIDGET (window->priv->lock_box));

1764