add seat name to Seat log messages

This makes it easier to debug multiseat setups.

4 files changed, 80 insertions, 80 deletions

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 8938455a..fede21bd 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -108,13 +108,13 @@ compositor_stopped_cb (Process *process, SeatUnity *seat)
     /* If stopped before it was ready, then revert to VT mode */
     if (!seat->priv->compositor_ready)
     {
-        g_debug ("Compositor failed to start, switching to VT mode");
+        l_debug (seat, "Compositor failed to start, switching to VT mode");
         seat->priv->use_vt_switching = TRUE;
         SEAT_CLASS (seat_unity_parent_class)->start (SEAT (seat));
         return;
     }
 
-    g_debug ("Stopping Unity seat, compositor terminated");
+    l_debug (seat, "Stopping Unity seat, compositor terminated");
 
     seat_stop (SEAT (seat));
 }
@@ -136,7 +136,7 @@ compositor_run_cb (Process *process, SeatUnity *seat)
 
          fd = g_open (seat->priv->log_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
          if (fd < 0)
-             g_warning ("Failed to open log file %s: %s", seat->priv->log_file, g_strerror (errno));
+             l_warning (seat, "Failed to open log file %s: %s", seat->priv->log_file, g_strerror (errno));
          else
          {
              dup2 (fd, STDOUT_FILENO);
@@ -161,7 +161,7 @@ write_message (SeatUnity *seat, guint16 id, const guint8 *payload, guint16 paylo
 
     errno = 0;
     if (write (seat->priv->to_compositor_pipe[1], data, data_length) != data_length)
-        g_warning ("Failed to write to compositor: %s", strerror (errno));
+        l_warning (seat, "Failed to write to compositor: %s", strerror (errno));
 }
 
 static gboolean
@@ -174,7 +174,7 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data)
   
     if (condition == G_IO_HUP)
     {
-        g_debug ("Compositor closed communication channel");
+        l_debug (seat, "Compositor closed communication channel");
         return FALSE;
     }
 
@@ -204,7 +204,7 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data)
                                           &n_read,
                                           &error);
         if (error)
-            g_warning ("Failed to read from compositor: %s", error->message);
+            l_warning (seat, "Failed to read from compositor: %s", error->message);
         if (status != G_IO_STATUS_NORMAL)
             return TRUE;
         g_clear_error (&error);
@@ -225,28 +225,28 @@ read_cb (GIOChannel *source, GIOCondition condition, gpointer data)
     switch (id)
     {
     case USC_MESSAGE_PING:
-        g_debug ("PING!");
+        l_debug (seat, "PING!");
         write_message (seat, USC_MESSAGE_PONG, NULL, 0);
         break;
     case USC_MESSAGE_PONG:
-        g_debug ("PONG!");
+        l_debug (seat, "PONG!");
         break;
     case USC_MESSAGE_READY:
-        g_debug ("READY");
+        l_debug (seat, "READY");
         if (!seat->priv->compositor_ready)
         {
             seat->priv->compositor_ready = TRUE;
-            g_debug ("Compositor ready");
+            l_debug (seat, "Compositor ready");
             g_source_remove (seat->priv->compositor_timeout);
             seat->priv->compositor_timeout = 0;
             SEAT_CLASS (seat_unity_parent_class)->start (SEAT (seat));
         }
         break;
     case USC_MESSAGE_SESSION_CONNECTED:
-        g_debug ("SESSION CONNECTED");
+        l_debug (seat, "SESSION CONNECTED");
         break;
     default:
-        g_warning ("Ignoring unknown message %d with %d octets from system compositor", id, payload_length);
+        l_warning (seat, "Ignoring unknown message %d with %d octets from system compositor", id, payload_length);
         break;
     }
 
@@ -310,7 +310,7 @@ seat_unity_start (Seat *seat)
             plymouth_quit (TRUE);
         }
         else
-            g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
+            l_debug (seat, "Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
     }
     if (plymouth_get_is_active ())
         plymouth_quit (FALSE);
@@ -318,7 +318,7 @@ seat_unity_start (Seat *seat)
         SEAT_UNITY (seat)->priv->vt = vt_get_unused ();
     if (SEAT_UNITY (seat)->priv->vt < 0)
     {
-        g_debug ("Failed to get a VT to run on");
+        l_debug (seat, "Failed to get a VT to run on");
         return FALSE;
     }
     vt_ref (SEAT_UNITY (seat)->priv->vt);
@@ -326,7 +326,7 @@ seat_unity_start (Seat *seat)
     /* Create pipes to talk to compositor */
     if (pipe (SEAT_UNITY (seat)->priv->to_compositor_pipe) < 0 || pipe (SEAT_UNITY (seat)->priv->from_compositor_pipe) < 0)
     {
-        g_debug ("Failed to create compositor pipes: %s", g_strerror (errno));
+        l_debug (seat, "Failed to create compositor pipes: %s", g_strerror (errno));
         return FALSE;
     }
 
@@ -341,7 +341,7 @@ seat_unity_start (Seat *seat)
     /* Setup logging */
     dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
     SEAT_UNITY (seat)->priv->log_file = g_build_filename (dir, "unity-system-compositor.log", NULL);
-    g_debug ("Logging to %s", SEAT_UNITY (seat)->priv->log_file);
+    l_debug (seat, "Logging to %s", SEAT_UNITY (seat)->priv->log_file);
     g_free (dir);
 
     SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
@@ -372,7 +372,7 @@ seat_unity_start (Seat *seat)
     timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
     if (timeout <= 0)
         timeout = 60;
-    g_debug ("Waiting for system compositor for %ds", timeout);
+    l_debug (seat, "Waiting for system compositor for %ds", timeout);
     SEAT_UNITY (seat)->priv->compositor_timeout = g_timeout_add (timeout * 1000, compositor_timeout_cb, seat);
 
     return TRUE;
@@ -386,7 +386,7 @@ create_x_server (Seat *seat)
     gboolean allow_tcp;
     gint port = 0;
 
-    g_debug ("Starting X server on Unity compositor");
+    l_debug (seat, "Starting X server on Unity compositor");
 
     x_server = x_server_local_new ();
 
@@ -441,7 +441,7 @@ create_x_server (Seat *seat)
         keys = g_key_file_new ();
         result = g_key_file_load_from_file (keys, path, G_KEY_FILE_NONE, &error);
         if (error)
-            g_debug ("Error getting key %s", error->message);
+            l_debug (seat, "Error getting key %s", error->message);
         g_clear_error (&error);
 
         if (result)
@@ -451,7 +451,7 @@ create_x_server (Seat *seat)
             if (g_key_file_has_key (keys, "keyring", key_name, NULL))
                 key = g_key_file_get_string (keys, "keyring", key_name, NULL);
             else
-                g_debug ("Key %s not defined", key_name);
+                l_debug (seat, "Key %s not defined", key_name);
 
             if (key)
                 x_server_local_set_xdmcp_key (x_server, key);
@@ -498,7 +498,7 @@ seat_unity_create_display_server (Seat *seat, const gchar *session_type)
         return create_mir_server (seat);
     else
     {
-        g_warning ("Can't create unsupported display server '%s'", session_type);
+        l_warning (seat, "Can't create unsupported display server '%s'", session_type);
         return NULL;
     }
 }
@@ -571,11 +571,11 @@ seat_unity_set_active_session (Seat *seat, Session *session)
 
         if (id)
         {
-            g_debug ("Switching to Mir session %s", id);
+            l_debug (seat, "Switching to Mir session %s", id);
             write_message (SEAT_UNITY (seat), USC_MESSAGE_SET_ACTIVE_SESSION, (const guint8 *) id, strlen (id));
         }
         else
-            g_warning ("Failed to work out session ID");
+            l_warning (seat, "Failed to work out session ID");
     }
 
     SEAT_CLASS (seat_unity_parent_class)->set_active_session (seat, session);
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index d3fd0d13..d79c77fe 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -69,9 +69,9 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
     gint vt = -1, port = 0;
 
     if (vt > 0)
-        g_debug ("Starting local X display on VT %d", vt);
+        l_debug (seat, "Starting local X display on VT %d", vt);
     else
-        g_debug ("Starting local X display");
+        l_debug (seat, "Starting local X display");
   
     x_server = x_server_local_new ();
 
@@ -95,7 +95,7 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
             plymouth_deactivate ();
         }
         else
-            g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
+            l_debug (seat, "Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
     }
     if (plymouth_get_is_active ())
         plymouth_quit (FALSE);
@@ -138,7 +138,7 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
         keys = g_key_file_new ();
         result = g_key_file_load_from_file (keys, path, G_KEY_FILE_NONE, &error);
         if (error)
-            g_debug ("Error getting key %s", error->message);
+            l_debug (seat, "Error getting key %s", error->message);
         g_clear_error (&error);      
 
         if (result)
@@ -148,7 +148,7 @@ seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
             if (g_key_file_has_key (keys, "keyring", key_name, NULL))
                 key = g_key_file_get_string (keys, "keyring", key_name, NULL);
             else
-                g_debug ("Key %s not defined", key_name);
+                l_debug (seat, "Key %s not defined", key_name);
 
             if (key)
                 x_server_local_set_xdmcp_key (x_server, key);
diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 0e60717f..3b5eec57 100644
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -33,7 +33,7 @@ seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
 
     if (strcmp (session_type, "x") != 0)
     {
-        g_warning ("X remote seat only supports X display servers, not '%s'", session_type);
+        l_warning (seat, "X remote seat only supports X display servers, not '%s'", session_type);
         return NULL;
     }
 
@@ -42,7 +42,7 @@ seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
         hostname = "localhost";
     number = seat_get_integer_property (seat, "xserver-display-number");
 
-    g_debug ("Starting remote X display %s:%d", hostname, number);
+    l_debug (seat, "Starting remote X display %s:%d", hostname, number);
 
     x_server = x_server_remote_new (hostname, number, NULL);
 
diff --git a/src/seat.c b/src/seat.c
index efc8b5ed..fd03954a 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -202,7 +202,7 @@ seat_set_active_session (Seat *seat, Session *session)
 
         if (IS_GREETER (s))
         {
-            g_debug ("Stopping greeter");
+            l_debug (seat, "Stopping greeter");
             session_stop (s);
         }
     }
@@ -281,7 +281,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
         exit_status = process_get_exit_status (script);
         if (WIFEXITED (exit_status))
         {
-            g_debug ("Exit status of %s: %d", script_name, WEXITSTATUS (exit_status));
+            l_debug (seat, "Exit status of %s: %d", script_name, WEXITSTATUS (exit_status));
             result = WEXITSTATUS (exit_status) == EXIT_SUCCESS;
         }
     }
@@ -319,7 +319,7 @@ check_stopped (Seat *seat)
         g_list_length (seat->priv->sessions) == 0)
     {
         seat->priv->stopped = TRUE;
-        g_debug ("Seat stopped");
+        l_debug (seat, "Seat stopped");
         g_signal_emit (seat, signals[STOPPED], 0);
     }
 }
@@ -336,7 +336,7 @@ display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
     GList *list, *link;
     Session *active_session;
 
-    g_debug ("Display server stopped");
+    l_debug (seat, "Display server stopped");
 
     g_signal_handlers_disconnect_matched (display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
     seat->priv->display_servers = g_list_remove (seat->priv->display_servers, display_server);
@@ -364,11 +364,11 @@ display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
             !session_get_is_started (session) &&
             g_list_length (seat->priv->display_servers) == 0)
         {
-            g_debug ("Stopping seat, greeter display server failed to start");
+            l_debug (seat, "Stopping seat, greeter display server failed to start");
             seat_stop (seat);
         }
 
-        g_debug ("Stopping session");
+        l_debug (seat, "Stopping session");
         session_stop (session);
     }
     g_list_free_full (list, g_object_unref);
@@ -379,7 +379,7 @@ display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
         active_session = seat_get_active_session (seat);
         if (!active_session || session_get_display_server (active_session) == display_server)
         {
-            g_debug ("Active display server stopped, starting greeter");
+            l_debug (seat, "Active display server stopped, starting greeter");
             seat_switch_to_greeter (seat);
         }
     }
@@ -416,7 +416,7 @@ switch_to_greeter_from_failed_session (Seat *seat, Session *session)
         display_server = create_display_server (seat, session_get_session_type (session));
         if (!display_server_start (display_server))
         {
-            g_debug ("Failed to start display server for greeter");
+            l_debug (seat, "Failed to start display server for greeter");
             seat_stop (seat);
         }
 
@@ -451,12 +451,12 @@ start_session (Seat *seat, Session *session)
 
     if (IS_GREETER (session))
     {
-        g_debug ("Failed to start greeter");
+        l_debug (seat, "Failed to start greeter");
         display_server_stop (session_get_display_server (session));
         return;
     }
 
-    g_debug ("Failed to start session, starting greeter");
+    l_debug (seat, "Failed to start session, starting greeter");
     switch_to_greeter_from_failed_session (seat, session);
 }
 
@@ -471,7 +471,7 @@ run_session (Seat *seat, Session *session)
         script = seat_get_string_property (seat, "session-setup-script");
     if (script && !run_script (seat, session_get_display_server (session), script, NULL))
     {
-        g_debug ("Switching to greeter due to failed setup script");
+        l_debug (seat, "Switching to greeter due to failed setup script");
         switch_to_greeter_from_failed_session (seat, session);
         return;
     }
@@ -499,17 +499,17 @@ session_authentication_complete_cb (Session *session, Seat *seat)
 {
     if (session_get_is_authenticated (session))
     {
-        g_debug ("Session authenticated, running command");
+        l_debug (seat, "Session authenticated, running command");
         run_session (seat, session);
     }
     else if (!IS_GREETER (session))
     {
-        g_debug ("Switching to greeter due to failed authentication");
+        l_debug (seat, "Switching to greeter due to failed authentication");
         switch_to_greeter_from_failed_session (seat, session);
     }
     else
     {
-        g_debug ("Stopping session that failed authentication");
+        l_debug (seat, "Stopping session that failed authentication");
         session_stop (session);
     }
 }
@@ -519,7 +519,7 @@ session_stopped_cb (Session *session, Seat *seat)
 {
     DisplayServer *display_server;
 
-    g_debug ("Session stopped");
+    l_debug (seat, "Session stopped");
 
     g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
     seat->priv->sessions = g_list_remove (seat->priv->sessions, session);
@@ -582,12 +582,12 @@ session_stopped_cb (Session *session, Seat *seat)
 
             if (session_get_is_authenticated (s))
             {
-                g_debug ("Greeter stopped, running session");
+                l_debug (seat, "Greeter stopped, running session");
                 run_session (seat, s);
             }
             else
             {
-                g_debug ("Greeter stopped, starting session authentication");
+                l_debug (seat, "Greeter stopped, starting session authentication");
                 start_session (seat, s);
             }
             break;
@@ -599,13 +599,13 @@ session_stopped_cb (Session *session, Seat *seat)
         g_list_length (seat->priv->display_servers) == 1 &&
         g_list_nth_data (seat->priv->display_servers, 0) == display_server)
     {
-        g_debug ("Stopping seat, failed to start a greeter");
+        l_debug (seat, "Stopping seat, failed to start a greeter");
         seat_stop (seat);
     }
     /* If we were the active session, switch to a greeter */
     else if (!IS_GREETER (session) && session == seat_get_active_session (seat))
     {
-        g_debug ("Active session stopped, starting greeter");
+        l_debug (seat, "Active session stopped, starting greeter");
         seat_switch_to_greeter (seat);
     }
 
@@ -625,7 +625,7 @@ session_stopped_cb (Session *session, Seat *seat)
         }
         if (n_sessions == 0)
         {
-            g_debug ("Stopping display server, no sessions require it");
+            l_debug (seat, "Stopping display server, no sessions require it");
             display_server_stop (display_server);
         }
     }
@@ -703,7 +703,7 @@ get_session_argv (Seat *seat, SessionConfig *session_config, const gchar *sessio
     /* Split command into an array listing and make command absolute */
     result = g_shell_parse_argv (session_config_get_command (session_config), &argc, &argv, &error);
     if (error)
-        g_debug ("Invalid session command '%s': %s", session_config_get_command (session_config), error->message);
+        l_debug (seat, "Invalid session command '%s': %s", session_config_get_command (session_config), error->message);
     g_clear_error (&error);
     if (!result)
         return NULL;
@@ -742,7 +742,7 @@ find_session_config (Seat *seat, const gchar *sessions_dir, const gchar *session
             break;
 
         if (dirs[i+1] == NULL)
-            g_debug ("Failed to find session configuration %s", session_name);
+            l_debug (seat, "Failed to find session configuration %s", session_name);
         g_clear_error (&error);
     }
     g_strfreev (dirs);
@@ -759,13 +759,13 @@ create_user_session (Seat *seat, const gchar *username)
     SessionConfig *session_config;
     Session *session = NULL;
 
-    g_debug ("Creating user session");
+    l_debug (seat, "Creating user session");
 
     /* Load user preferences */
     user = accounts_get_user_by_name (username);
     if (!user)
     {
-        g_debug ("Can't login unknown user '%s'", username);
+        l_debug (seat, "Can't login unknown user '%s'", username);
         return NULL;
     }
     session_name = user_get_xsession (user);
@@ -799,7 +799,7 @@ create_user_session (Seat *seat, const gchar *username)
         g_object_unref (session_config);
     }
     else
-        g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+        l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
 
 
     g_object_unref (user);
@@ -819,7 +819,7 @@ create_guest_session (Seat *seat)
     g_free (sessions_dir);
     if (!session_config)
     {
-        g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+        l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
         return NULL;
     }
 
@@ -915,7 +915,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
     existing_session = find_user_session (seat, username);
     if (existing_session && session != existing_session)
     {
-        g_debug ("Returning to existing user session %s", username);
+        l_debug (seat, "Returning to existing user session %s", username);
         session_stop (session);
         seat_set_active_session (seat, existing_session);
         return TRUE;
@@ -950,7 +950,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
     g_free (sessions_dir);
     if (!session_config)
     {
-        g_debug ("Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+        l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
         return FALSE;
     }
 
@@ -973,7 +973,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
     if (can_share_display_server (seat, display_server) &&
         strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
     {
-        g_debug ("Stopping greeter; display server will be re-used for user session");
+        l_debug (seat, "Stopping greeter; display server will be re-used for user session");
 
         /* Run on the same display server after the greeter has stopped */
         session_set_display_server (session, display_server);
@@ -990,7 +990,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
         session_set_display_server (session, display_server);
         if (!display_server_start (display_server))
         {
-            g_debug ("Failed to start display server for new session");
+            l_debug (seat, "Failed to start display server for new session");
             return FALSE;
         }
 
@@ -1007,7 +1007,7 @@ create_greeter_session (Seat *seat)
     gchar *greeter_user;
     const gchar *greeter_wrapper;
 
-    g_debug ("Creating greeter session");
+    l_debug (seat, "Creating greeter session");
 
     sessions_dir = config_get_string (config_get_instance (), "LightDM", "greeters-directory");
     session_config = find_session_config (seat, sessions_dir, seat_get_string_property (seat, "greeter-session"));
@@ -1082,7 +1082,7 @@ display_server_ready_cb (DisplayServer *display_server, Seat *seat)
     script = seat_get_string_property (seat, "display-setup-script");
     if (script && !run_script (seat, display_server, script, NULL))
     {
-        g_debug ("Stopping display server due to failed setup script");
+        l_debug (seat, "Stopping display server due to failed setup script");
         display_server_stop (display_server);
         return;
     }
@@ -1099,18 +1099,18 @@ display_server_ready_cb (DisplayServer *display_server, Seat *seat)
     {
         if (session_get_is_authenticated (session))
         {
-            g_debug ("Display server ready, running session");
+            l_debug (seat, "Display server ready, running session");
             run_session (seat, session);
         }
         else
         {
-            g_debug ("Display server ready, starting session authentication");
+            l_debug (seat, "Display server ready, starting session authentication");
             start_session (seat, session);
         }
     }
     else
     {
-        g_debug ("Stopping not required display server");
+        l_debug (seat, "Stopping not required display server");
         display_server_stop (display_server);
     }
 }
@@ -1120,7 +1120,7 @@ create_display_server (Seat *seat, const gchar *session_type)
 {
     DisplayServer *display_server;
 
-    g_debug ("Creating display server of type %s", session_type);
+    l_debug (seat, "Creating display server of type %s", session_type);
 
     display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type);
     if (!display_server)
@@ -1163,7 +1163,7 @@ seat_switch_to_greeter (Seat *seat)
     greeter_session = find_greeter_session (seat);
     if (greeter_session)
     {
-        g_debug ("Switching to existing greeter");
+        l_debug (seat, "Switching to existing greeter");
         seat_set_active_session (seat, SESSION (greeter_session));
         return TRUE;
     }
@@ -1193,12 +1193,12 @@ seat_switch_to_user (Seat *seat, const gchar *username, const gchar *session_nam
     if (!seat->priv->can_switch)
         return FALSE;
 
-    g_debug ("Switching to user %s", username);
+    l_debug (seat, "Switching to user %s", username);
 
     session = find_user_session (seat, username);
     if (session)
     {
-        g_debug ("Switching to existing user session %s", username);
+        l_debug (seat, "Switching to existing user session %s", username);
         seat_set_active_session (seat, session);
         return TRUE;
     }
@@ -1249,7 +1249,7 @@ seat_switch_to_guest (Seat *seat, const gchar *session_name)
     session = find_guest_session (seat);
     if (session)
     {
-        g_debug ("Switching to existing guest account %s", session_get_username (session));
+        l_debug (seat, "Switching to existing guest account %s", session_get_username (session));
         seat_set_active_session (seat, session);
         return TRUE;
     }
@@ -1282,13 +1282,13 @@ seat_lock (Seat *seat, const gchar *username)
     if (!seat->priv->can_switch)
         return FALSE;
 
-    g_debug ("Locking seat");
+    l_debug (seat, "Locking seat");
 
     /* Switch to greeter if one open (shouldn't be though) */
     greeter_session = find_greeter_session (seat);
     if (greeter_session)
     {
-        g_debug ("Switching to existing greeter");
+        l_debug (seat, "Switching to existing greeter");
         seat_set_active_session (seat, SESSION (greeter_session));
         return TRUE;
     }
@@ -1320,7 +1320,7 @@ seat_stop (Seat *seat)
     if (seat->priv->stopping)
         return;
 
-    g_debug ("Stopping seat");
+    l_debug (seat, "Stopping seat");
     seat->priv->stopping = TRUE;
     SEAT_GET_CLASS (seat)->stop (seat);
 }
@@ -1352,7 +1352,7 @@ seat_real_start (Seat *seat)
     gboolean autologin_in_background;
     Session *session = NULL, *background_session = NULL;
 
-    g_debug ("Starting seat");
+    l_debug (seat, "Starting seat");
 
     /* If this display server doesn't have a session running on it, just start it */
     if (!get_start_local_sessions (seat))
@@ -1400,7 +1400,7 @@ seat_real_start (Seat *seat)
             session_set_display_server (session, display_server);
             if (!display_server || !display_server_start (display_server))
             {
-                g_debug ("Can't create display server for automatic login");
+                l_debug (seat, "Can't create display server for automatic login");
                 session_stop (session);
                 if (display_server)
                     display_server_stop (display_server);
@@ -1418,7 +1418,7 @@ seat_real_start (Seat *seat)
         greeter_session = create_greeter_session (seat);
         if (!greeter_session)
         {
-            g_debug ("Failed to create greeter session");
+            l_debug (seat, "Failed to create greeter session");
             return FALSE;
         }
 
@@ -1444,7 +1444,7 @@ seat_real_start (Seat *seat)
         session_set_display_server (session, display_server);
         if (!display_server || !display_server_start (display_server))
         {
-            g_debug ("Can't create display server for greeter");
+            l_debug (seat, "Can't create display server for greeter");
             session_stop (session);
             if (display_server)
                 display_server_stop (display_server);
@@ -1467,7 +1467,7 @@ seat_real_start (Seat *seat)
         background_display_server = create_display_server (seat, session_get_session_type (background_session));
         session_set_display_server (background_session, background_display_server);
         if (!display_server_start (background_display_server))
-            g_warning ("Failed to start display server for background session");
+            l_warning (seat, "Failed to start display server for background session");
     }
 
     seat->priv->started = TRUE;
@@ -1516,7 +1516,7 @@ seat_real_stop (Seat *seat)
         DisplayServer *display_server = link->data;
         if (!display_server_get_is_stopping (display_server))
         {
-            g_debug ("Stopping display server");
+            l_debug (seat, "Stopping display server");
             display_server_stop (display_server);
         }
     }
@@ -1529,7 +1529,7 @@ seat_real_stop (Seat *seat)
         Session *session = link->data;
         if (!session_get_is_stopping (session))
         {
-            g_debug ("Stopping session");
+            l_debug (seat, "Stopping session");
             session_stop (session);
         }
     }