r36634 - in /desktop/unstable/gdm3/debian: changelog patches/24_move_failure_detection.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 10 16:24:49 2013
New Revision: 36634

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36634
Log:
24_move_failure_detection.patch: new patch. Detect when a display is 
in FAILED state at finish() time, not unmanage(). This makes the 
logic for restarting displays upon failure correct. Closes: #681830.

Added:
    desktop/unstable/gdm3/debian/patches/24_move_failure_detection.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=36634&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Feb 10 16:24:49 2013
@@ -1,3 +1,11 @@
+gdm3 (3.4.1-6) UNRELEASED; urgency=low
+
+  * 24_move_failure_detection.patch: new patch. Detect when a display is 
+    in FAILED state at finish() time, not unmanage(). This makes the 
+    logic for restarting displays upon failure correct. Closes: #681830.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 10 Feb 2013 17:24:04 +0100
+
 gdm3 (3.4.1-5) unstable; urgency=low
 
   * gdm3.prerm: do not stop gdm3 if $DISPLAY is between :0 and :9 which 

Added: desktop/unstable/gdm3/debian/patches/24_move_failure_detection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/24_move_failure_detection.patch?rev=36634&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/24_move_failure_detection.patch (added)
+++ desktop/unstable/gdm3/debian/patches/24_move_failure_detection.patch [utf-8] Sun Feb 10 16:24:49 2013
@@ -1,0 +1,54 @@
+Detect the FAILED state of a display at finish time, not at unmanage 
+time. Otherwise it would be set as FINISHED first and treated like it 
+ended properly.
+
+Also bring the delay down to 2 seconds.
+
+Index: gdm3-3.4.1/daemon/gdm-display.c
+===================================================================
+--- gdm3-3.4.1.orig/daemon/gdm-display.c	2013-02-10 17:05:56.817105767 +0100
++++ gdm3-3.4.1/daemon/gdm-display.c	2013-02-10 17:19:55.817207422 +0100
+@@ -667,9 +667,17 @@ gdm_display_real_finish (GdmDisplay *dis
+ {
+         g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+ 
+-        _gdm_display_set_status (display, GDM_DISPLAY_FINISHED);
++        g_timer_stop (display->priv->slave_timer);
++        elapsed = g_timer_elapsed (display->priv->slave_timer, NULL);
++
++        if (elapsed < 2) {
++                g_warning ("GdmDisplay: display lasted %lf seconds", elapsed);
++                _gdm_display_set_status (display, GDM_DISPLAY_FAILED);
++        } else {
++                _gdm_display_set_status (display, GDM_DISPLAY_FINISHED);
++        }
+ 
+-        g_debug ("GdmDisplay: finish display");
++        g_debug ("GdmDisplay: finished display after %lf seconds", elapsed);
+ 
+         return TRUE;
+ }
+@@ -699,8 +707,6 @@ gdm_display_real_unmanage (GdmDisplay *d
+ 
+         g_debug ("GdmDisplay: unmanage display");
+ 
+-        g_timer_stop (display->priv->slave_timer);
+-
+         if (display->priv->slave_proxy != NULL) {
+                 gdm_slave_proxy_stop (display->priv->slave_proxy);
+ 
+@@ -720,13 +726,7 @@ gdm_display_real_unmanage (GdmDisplay *d
+                 display->priv->access_file = NULL;
+         }
+ 
+-        elapsed = g_timer_elapsed (display->priv->slave_timer, NULL);
+-        if (elapsed < 3) {
+-                g_warning ("GdmDisplay: display lasted %lf seconds", elapsed);
+-                _gdm_display_set_status (display, GDM_DISPLAY_FAILED);
+-        } else {
+-                _gdm_display_set_status (display, GDM_DISPLAY_UNMANAGED);
+-        }
++        _gdm_display_set_status (display, GDM_DISPLAY_UNMANAGED);
+ 
+         return TRUE;
+ }

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=36634&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sun Feb 10 16:24:49 2013
@@ -15,6 +15,7 @@
 21_static_display_purge.patch
 22_noconsole.patch
 23_start_polkit.patch
+24_move_failure_detection.patch
 30_dbus_prctl_death.patch
 31_worker_session_gone.patch
 32_ignore_greeter_crash.patch