Attachment 323035 Details for Bug 540482

[patch] Untested patch

gdm-runlevel.patch (text/plain), 1.59 KB, created by Vincent Untz on 2009-10-19 10:10:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Untz

Created: 2009-10-19 10:10:30 UTC

Size: 1.59 KB

patch

obsolete

>diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c
>index a747ee3..2f65aa0 100644
>--- a/daemon/gdm-static-display.c
>+++ b/daemon/gdm-static-display.c
>@@ -26,6 +26,7 @@
> #include <fcntl.h>
> #include <pwd.h>
> #include <unistd.h>
>+#include <utmp.h>
> #include <string.h>
> #include <signal.h>
> #include <sys/stat.h>
>@@ -96,6 +97,29 @@ gdm_static_display_manage (GdmDisplay *display)
> }
> 
> static gboolean
>+gdm_static_display_should_manager_again (void)
>+{
>+        struct utmp *ut;
>+
>+        setutent();
>+        while ((ut = getutent()) != NULL) {
>+                if (ut->ut_type == RUN_LVL) {
>+                        int current;
>+                        current = ut->ut_pid % 256;
>+                        endutent();
>+
>+                        if (current == 0 || current == 6)
>+                                return FALSE;
>+                        return TRUE;
>+                }
>+        }
>+
>+        endutent();
>+
>+        return TRUE;
>+}
>+
>+static gboolean
> gdm_static_display_finish (GdmDisplay *display)
> {
>         int status;
>@@ -108,9 +132,11 @@ gdm_static_display_finish (GdmDisplay *display)
>         /* restart static displays */
>         gdm_display_unmanage (display);
> 
>-        status = gdm_display_get_status (display);
>-        if (status != GDM_DISPLAY_FAILED) {
>-                gdm_display_manage (display);
>+        if (gdm_static_display_should_manager_again ()) {
>+                status = gdm_display_get_status (display);
>+                if (status != GDM_DISPLAY_FAILED) {
>+                        gdm_display_manage (display);
>+                }
>         }
> 
>         return TRUE;

Actions: View | Diff

Attachments on bug 540482: 320325 | 320327 | 320945 | 323035 | 323336 | 333612 | 333614