Attachment 662210 Details for Bug 886442 – The proposed fix

[patch] The proposed fix

lightdm-1.4.0-active-display.patch (text/plain), 1.56 KB, created by Martin Bříza on 2012-12-12 10:03:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Bříza

Created: 2012-12-12 10:03:50 UTC

Size: 1.56 KB

patch

obsolete

>--- src/seat-xlocal.c.active-display	2012-03-02 06:41:27.000000000 +0100
>+++ src/seat-xlocal.c	2012-12-12 10:42:37.648510265 +0100
>@@ -160,12 +160,14 @@ seat_xlocal_display_removed (Seat *seat,
>         return;
>     }
> 
>-    /* Show a new greeter */  
>-    if (display == seat_get_active_display (seat))
>-    {
>-        g_debug ("Active display stopped, switching to greeter");
>-        seat_switch_to_greeter (seat);
>-    }
>+    gchar *tty_string = g_strdup_printf ("/dev/tty%d", vt_get_active());
>+    /* Show a new greeter */
>+	if (g_strcmp0(vt_get_active(), session_get_tty(display_get_session(display))))
>+	{
>+		g_debug ("Active display stopped, switching to greeter");
>+		seat_switch_to_greeter (seat);
>+	}
>+	g_free(tty_string);
> }
> 
> static void
>--- src/session.c~	2012-12-12 10:44:20.160248139 +0100
>+++ src/session.c	2012-12-12 10:44:20.175248105 +0100
>@@ -108,6 +108,13 @@ session_set_class (Session *session, con
>     session->priv->class = g_strdup (class);
> }
> 
>+const gchar *
>+session_get_tty (Session *session)
>+{
>+    g_return_val_if_fail (session != NULL, NULL);
>+    return session->priv->tty;
>+}
>+
> void
> session_set_tty (Session *session, const gchar *tty)
> {
>--- src/session.h~	2012-12-12 10:44:22.414242501 +0100
>+++ src/session.h	2012-12-12 10:44:22.426242474 +0100
>@@ -59,6 +59,8 @@ void session_set_log_file (Session *sess
> 
> void session_set_class (Session *session, const gchar *class);
> 
>+const gchar *session_get_tty (Session *session);
>+
> void session_set_tty (Session *session, const gchar *tty);
> 
> void session_set_xdisplay (Session *session, const gchar *xdisplay);

Actions: View | Diff

Attachments on bug 886442: 662210