Fix problem causing SET_LOGOUT_ACTION and SET_SAFE_LOGOUT_ACTION to not

2007-05-02  Brian Cameron  <brian.cameron@sun.com>

        * daemon/gdm.c: Fix problem causing SET_LOGOUT_ACTION and
          SET_SAFE_LOGOUT_ACTION to not work.

svn path=/trunk/; revision=4885

2 files changed, 23 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 54371cca..22c0efe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-02  Brian Cameron  <brian.cameron@sun.com>
+
+	* daemon/gdm.c: Fix problem causing SET_LOGOUT_ACTION and
+	  SET_SAFE_LOGOUT_ACTION to not work.
+
 2007-05-01  Brian Cameron  <brian.cameron@sun.com>
 
 	* daemon/gdm-daemon-config.c: Fix return of
@@ -8121,11 +8126,11 @@ Wed Jul 23 14:29:53 2003  George Lebl <jirka@5z.com>
 
 Wed Jul 23 11:41:16 2003  George Lebl <jirka@5z.com>
 
-	* daemon/misc.c: raise the cache time of gethostbyaddr/name to 60 seconds
-	  and catch TERM/HUP/INT signals during this time and whack the host
-	  resolution when we catch these.  This way it is possible to SIGTERM
-	  the gdm daemon during a hanging resolution call.  Fixes issues from
-	  #109331
+	* daemon/misc.c: raise the cache time of gethostbyaddr/name to 60
+	  seconds and catch TERM/HUP/INT signals during this time and whack the
+	  host resolution when we catch these.  This way it is possible to
+	  SIGTERM the gdm daemon during a hanging resolution call.  Fixes
+	  issues from #109331
 
 Tue Jul 22 18:15:51 2003  George Lebl <jirka@5z.com>
 
diff --git a/daemon/gdm.c b/daemon/gdm.c
index e3d64390..19e382b4 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -3716,24 +3716,24 @@ sup_handle_query_logout_action (GdmConnection *conn,
 	if (logout_action == GDM_LOGOUT_ACTION_NONE)
 		logout_action = safe_logout_action;
 
-	if (! ve_string_empty (gdm_daemon_config_get_value_string_array (GDM_KEY_HALT)) &&
-	      is_action_available (disp, GDM_SUP_LOGOUT_ACTION_HALT)) {
+	if (gdm_daemon_config_get_value_string_array (GDM_KEY_HALT) &&
+	    is_action_available (disp, GDM_SUP_LOGOUT_ACTION_HALT)) {
 		g_string_append_printf (reply, "%s%s", sep,
 			GDM_SUP_LOGOUT_ACTION_HALT);
 		if (logout_action == GDM_LOGOUT_ACTION_HALT)
 			g_string_append (reply, "!");
 		sep = ";";
 	}
-	if (! ve_string_empty (gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT)) &&
-	      is_action_available (disp, GDM_SUP_LOGOUT_ACTION_REBOOT)) {
+	if (gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT) &&
+	    is_action_available (disp, GDM_SUP_LOGOUT_ACTION_REBOOT)) {
 		g_string_append_printf (reply, "%s%s", sep,
 			GDM_SUP_LOGOUT_ACTION_REBOOT);
 		if (logout_action == GDM_LOGOUT_ACTION_REBOOT)
 			g_string_append (reply, "!");
 		sep = ";";
 	}
-	if (! ve_string_empty (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND)) &&
-	      is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
+	if (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) &&
+	    is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
 		g_string_append_printf (reply, "%s%s", sep,
 			GDM_SUP_LOGOUT_ACTION_SUSPEND);
 		if (logout_action == GDM_LOGOUT_ACTION_SUSPEND)
@@ -3976,17 +3976,17 @@ sup_handle_set_logout_action (GdmConnection *conn,
 		disp->logout_action = GDM_LOGOUT_ACTION_NONE;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_HALT) == 0 &&
-		   ! gdm_daemon_config_get_value_string_array (GDM_KEY_HALT) &&
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_HALT) &&
 		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_HALT)) {
 		disp->logout_action = GDM_LOGOUT_ACTION_HALT;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_REBOOT) == 0 &&
-		    ! gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT) &&
-		    is_action_available (disp, GDM_SUP_LOGOUT_ACTION_REBOOT)) {
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT) &&
+		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_REBOOT)) {
 		disp->logout_action = GDM_LOGOUT_ACTION_REBOOT;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_SUSPEND) == 0 &&
-		   ! gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) &&
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) &&
 		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
 		disp->logout_action = GDM_LOGOUT_ACTION_SUSPEND;
 		was_ok = TRUE;
@@ -4044,17 +4044,17 @@ sup_handle_set_safe_logout_action (GdmConnection *conn,
 		safe_logout_action = GDM_LOGOUT_ACTION_NONE;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_HALT) == 0 &&
-		   ! gdm_daemon_config_get_value_string_array (GDM_KEY_HALT) &&
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_HALT) &&
 		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_HALT)) {
 		safe_logout_action = GDM_LOGOUT_ACTION_HALT;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_REBOOT) == 0 &&
-		   ! gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT) &&
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_REBOOT) &&
 		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_REBOOT)) {
 		safe_logout_action = GDM_LOGOUT_ACTION_REBOOT;
 		was_ok = TRUE;
 	} else if (strcmp (action, GDM_SUP_LOGOUT_ACTION_SUSPEND) == 0 &&
-		   ! gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) &&
+		   gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) &&
 		   is_action_available (disp, GDM_SUP_LOGOUT_ACTION_SUSPEND)) {
 		safe_logout_action = GDM_LOGOUT_ACTION_SUSPEND;
 		was_ok = TRUE;