diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 2 | ||||
| -rw-r--r-- | daemon/gdm-session-worker.c | 7 |
3 files changed, 13 insertions, 4 deletions
@@ -2,6 +2,14 @@ * daemon/gdm-local-display-factory.c: (on_static_display_status_changed): + * daemon/gdm-session-worker.c: + (gdm_session_worker_update_username), (state_change_idle): + Fix text in some debug statements and warnings. + +2008-04-02 William Jon McCann <jmccann@redhat.com> + + * daemon/gdm-local-display-factory.c: + (on_static_display_status_changed): Don't g_critical when bailing out after max num of xserver failures since that triggers a backtrace. diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index ee311937..72a2f4ae 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -316,7 +316,7 @@ on_static_display_status_changed (GdmDisplay *display, factory->priv->num_failures++; if (factory->priv->num_failures > MAX_DISPLAY_FAILURES) { /* oh shit */ - g_warning ("GdmLocalDisplayFactory: maximum number of displays failures reached: check X server log for errors"); + g_warning ("GdmLocalDisplayFactory: maximum number of X display failures reached: check X server log for errors"); exit (1); } diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 4eb63f15..964530b8 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -552,8 +552,9 @@ gdm_session_worker_update_username (GdmSessionWorker *worker) res = gdm_session_worker_get_username (worker, &username); if (res) { g_debug ("GdmSessionWorker: old-username='%s' new-username='%s'", - username != NULL ? username : "<unset>", - worker->priv->username != NULL ? worker->priv->username : "<unset>"); + worker->priv->username != NULL ? worker->priv->username : "<unset>", + username != NULL ? username : "<unset>"); + gdm_session_auditor_set_username (worker->priv->auditor, worker->priv->username); @@ -2036,7 +2037,7 @@ state_change_idle (GdmSessionWorker *worker) int new_state; new_state = worker->priv->state + 1; - g_debug ("GdmSessionWorker: changing state to %s", + g_debug ("GdmSessionWorker: attempting to change state to %s", get_state_name (new_state)); worker->priv->state_change_idle_id = 0; |