- Prevent some spurious wake ups caused by the timed login timer animation

This commit is contained in:
Ray Strode 2008-03-10 14:03:28 +00:00
parent 979d2a989f
commit 9fd5ac9acf
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,31 @@
--- gdm-2.21.9/gui/simple-greeter/gdm-chooser-widget.c (revision 5978)
+++ gdm-2.21.9/gui/simple-greeter/gdm-chooser-widget.c (working copy)
@@ -82,6 +82,7 @@ struct GdmChooserWidgetPrivate
gint number_of_separated_rows;
gint number_of_rows_with_status;
gint number_of_rows_with_images;
+ gint number_of_active_timers;
guint update_idle_id;
guint animation_timeout_id;
@@ -2034,6 +2035,7 @@ start_timer (GdmChooserWidget *widget
gtk_list_store_set (widget->priv->list_store, &iter,
CHOOSER_TIMER_VALUE_COLUMN, 0.0, -1);
+ widget->priv->number_of_active_timers++;
if (widget->priv->timer_animation_timeout_id == 0) {
g_assert (g_hash_table_size (widget->priv->rows_with_timers) == 1);
@@ -2067,6 +2069,12 @@ stop_timer (GdmChooserWidget *widget,
0.0, -1);
gtk_list_store_set (widget->priv->list_store, &iter,
CHOOSER_TIMER_VALUE_COLUMN, 0.0, -1);
+
+ widget->priv->number_of_active_timers--;
+ if (widget->priv->number_of_active_timers == 0) {
+ g_source_remove (widget->priv->timer_animation_timeout_id);
+ widget->priv->timer_animation_timeout_id = 0;
+ }
}
static void

View File

@ -19,7 +19,7 @@
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
Name: gdm Name: gdm
Version: 2.21.9 Version: 2.21.9
Release: 0.2008.03.10.1%{?dist} Release: 0.2008.03.10.2%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: User Interface/X Group: User Interface/X
@ -89,6 +89,7 @@ BuildRequires: gnome-panel-devel
Requires: audit-libs >= %{libauditver} Requires: audit-libs >= %{libauditver}
Patch0: gdm-2.21.9-prevent-some-spurious-wakeups.patch
Patch99: gdm-2.21.8-fedora-logo.patch Patch99: gdm-2.21.8-fedora-logo.patch
%package user-switch-applet %package user-switch-applet
@ -109,6 +110,7 @@ multiple simulanteous logged in users.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .prevent-some-spurious-wakeups
%patch99 -p1 -b .fedora-logo %patch99 -p1 -b .fedora-logo
%build %build
@ -302,6 +304,10 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog %changelog
* Mon Mar 10 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.9-0.2008.03.10.2
- Prevent some spurious wake ups caused by the
timed login timer animation
* Mon Mar 10 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.9-0.2008.03.10.1 * Mon Mar 10 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.9-0.2008.03.10.1
- Update to latest snapshot - Update to latest snapshot