r28462 - /desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jun 15 18:52:37 2011
New Revision: 28462

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28462
Log:
Add another missing bit.

Modified:
    desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch

Modified: desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch?rev=28462&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/21_static_display_purge.patch [utf-8] Wed Jun 15 18:52:37 2011
@@ -11,3 +11,31 @@
                  }
                  break;
          case GDM_DISPLAY_FAILED:
+Index: gdm-3.0.4/daemon/gdm-static-display.c
+===================================================================
+--- gdm-3.0.4.orig/daemon/gdm-static-display.c	2011-06-15 20:47:16.413562347 +0200
++++ gdm-3.0.4/daemon/gdm-static-display.c	2011-06-15 20:52:18.311038265 +0200
+@@ -98,21 +98,13 @@ gdm_static_display_manage (GdmDisplay *d
+ static gboolean
+ gdm_static_display_finish (GdmDisplay *display)
+ {
+-        int status;
+-
+         g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+ 
+-        /* Don't call parent's finish since we don't ever
+-           want to be put in the FINISHED state */
++        GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->finish (display);
+ 
+-        /* restart static displays */
++        /* We don't restart static displays unless switch_on_finish is set */
+         gdm_display_unmanage (display);
+ 
+-        status = gdm_display_get_status (display);
+-        if (status != GDM_DISPLAY_FAILED) {
+-                gdm_display_manage (display);
+-        }
+-
+         return TRUE;
+ }
+