gdm r6089 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Wed Apr  2 18:27:07 2008
New Revision: 6089
URL: http://svn.gnome.org/viewvc/gdm?rev=6089&view=rev

Log:
2008-04-02  William Jon McCann  <jmccann redhat com>

	* 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.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-local-display-factory.c
   trunk/daemon/gdm-session-worker.c

Modified: trunk/daemon/gdm-local-display-factory.c
==============================================================================
--- trunk/daemon/gdm-local-display-factory.c	(original)
+++ trunk/daemon/gdm-local-display-factory.c	Wed Apr  2 18:27:07 2008
@@ -316,7 +316,7 @@
                 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);
                 }
 

Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c	(original)
+++ trunk/daemon/gdm-session-worker.c	Wed Apr  2 18:27:07 2008
@@ -552,8 +552,9 @@
         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 @@
         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;