[gnome-session] manager: don't show inhibitor dialog if no inhibitors

[Ray Strode <halfline src gnome org>]

commit 14e39d6aaed4a34448fe264a8393e3527522c4d2
Author: Ray Strode <rstrode redhat com>
Date:   Thu Feb 17 14:52:04 2011 -0500

    manager: don't show inhibitor dialog if no inhibitors
    
    I moved this to the wrong place when shuffling code around before.
    
    Spotted by vuntz
    
    http://bugzilla.gnome.org/637188

 gnome-session/gsm-manager.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 58e1965..ed932a1 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -1112,6 +1112,11 @@ end_session_or_show_fallback_dialog (GsmManager *manager)
 {
         GsmLogoutAction action;
 
+        if (! gsm_manager_is_logout_inhibited (manager)) {
+                end_phase (manager);
+                return;
+        }
+
         if (manager->priv->inhibit_dialog != NULL) {
                 g_debug ("GsmManager: inhibit dialog already up");
                 gtk_window_present (GTK_WINDOW (manager->priv->inhibit_dialog));
@@ -1139,11 +1144,6 @@ end_session_or_show_fallback_dialog (GsmManager *manager)
                 break;
         }
 
-        if (! gsm_manager_is_logout_inhibited (manager)) {
-                end_phase (manager);
-                return;
-        }
-
         /* Note: GSM_LOGOUT_ACTION_SHUTDOWN and GSM_LOGOUT_ACTION_REBOOT are
          * actually handled the same way as GSM_LOGOUT_ACTION_LOGOUT in the
          * inhibit dialog; the action, if the button is clicked, will be to