gnome-session r5350 - in trunk: . gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Tue Mar 24 22:21:54 2009
New Revision: 5350
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5350&view=rev

Log:
2009-03-24  Vincent Untz  <vuntz gnome org>

	* gnome-session/gsm-inhibit-dialog.c: (update_dialog_text): fix debug
	string
	* gnome-session/gsm-manager.c: (cancel_end_session): add debug string
	(gsm_manager_shutdown): fix debug string


Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-inhibit-dialog.c
   trunk/gnome-session/gsm-manager.c

Modified: trunk/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.c	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.c	Tue Mar 24 22:21:54 2009
@@ -667,7 +667,7 @@
                 header_text = _("A program is still running:");
                 description_text = _("Waiting for program to finish.  Interrupting program may cause you to lose work.");
         } else {
-                g_debug ("Found multiple entries in model");
+                g_debug ("Found multiple entries (or none) in model");
                 header_text = _("Some programs are still running:");
                 description_text = _("Waiting for programs to finish.  Interrupting these programs may cause you to lose work.");
         }

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Tue Mar 24 22:21:54 2009
@@ -728,6 +728,7 @@
 cancel_end_session (GsmManager *manager)
 {
         /* switch back to running phase */
+        g_debug ("GsmManager: Cancelling the end of session");
 
         /* clear all JIT inhibitors */
         gsm_store_foreach_remove (manager->priv->inhibitors,
@@ -2617,7 +2618,7 @@
                 g_set_error (error,
                              GSM_MANAGER_ERROR,
                              GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-                             "Logout interface is only available during the Running phase");
+                             "Shutdown interface is only available during the Running phase");
                 return FALSE;
         }