[gnome-session] shell: drop has_open_dialog state variable



commit c6aa04195c75350033107f472b826fb078da8666
Author: Ray Strode <rstrode redhat com>
Date:   Tue Mar 22 13:29:09 2011 -0400

    shell: drop has_open_dialog state variable
    
    We don't actually need it, since the only time
    we care if the dialog is open, is when it also
    has stale inhibitors.  That case is already implied
    by shell->priv->update_idle_id != 0.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=645485

 gnome-session/gsm-shell.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
index 5e4c9f8..fc2501b 100644
--- a/gnome-session/gsm-shell.c
+++ b/gnome-session/gsm-shell.c
@@ -57,7 +57,6 @@ struct _GsmShellPrivate
         GsmStore        *inhibitors;
 
         guint32          is_running : 1;
-        guint32          has_open_dialog : 1;
 
         DBusGProxyCall  *end_session_open_call;
         GsmShellEndSessionDialogType end_session_dialog_type;
@@ -471,7 +470,6 @@ on_open_finished (DBusGProxy     *proxy,
                 return;
         }
 
-        shell->priv->has_open_dialog = TRUE;
         g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_OPENED], 0);
 }
 
@@ -487,7 +485,6 @@ on_end_session_dialog_closed (DBusGProxy *proxy,
         g_signal_handlers_disconnect_by_func (shell->priv->inhibitors,
                                               G_CALLBACK (queue_end_session_dialog_update),
                                               shell);
-        shell->priv->has_open_dialog = FALSE;
 
         g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CLOSED], 0);
 }
@@ -525,11 +522,6 @@ on_need_end_session_dialog_update (GsmShell *shell)
 
         shell->priv->update_idle_id = 0;
 
-        if (!shell->priv->has_open_dialog)
-                return FALSE;
-
-        shell->priv->has_open_dialog = FALSE;
-
         gsm_shell_open_end_session_dialog (shell,
                                            shell->priv->end_session_dialog_type,
                                            shell->priv->inhibitors);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]