toolbar: fix ops button so it gets removed when multiple windows open

In some cases, the operations button doesn't get removed from every
Nautilus window. And if clicked, an empty popover will appear.  One case
is when the user starts a long operation, and then closes the popovers
in all windows once the operations have completed (and before the
buttons are due to be removed).

All windows get notified that the operations have finished. But if
there's a popover open in any window at that point, the windows don't
schedule removal of the button - as the logic is to keep the buttons
visible while there are popovers open. When the user then closes the
popover in the last window, that window knows there are no popovers in
the other windows, so it removes the button from it's toolbar. But
there's nothing to notify the other windows to remove their buttons.

The fix is to implement a more robust solution; instead of the windows
checking the other windows for popovers (windows shouldn't know about
the other windows anyway), the progress info manager maintains a list of
viewers. When an popover is open or closed, the window tells the manager
to update it's list of viewers. When there are no entries in the list,
the info manager notifies all listeners (the windows), so they all know
when to schedule removal of their buttons.

https://bugzilla.gnome.org/show_bug.cgi?id=765019

1 files changed, 29 insertions, 32 deletions

diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index d36b56c6a..3c1255888 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -473,38 +473,13 @@ add_operations_button_attention_style (NautilusToolbar *self)
                                                                             self);
 }
 
-/* It's not the most beautiful solution, but we need to check wheter all windows
- * have it's button inactive, so the toolbar can schedule to remove the operations
- * only in that case to avoid other windows to show an empty popover in the oposite
- * case */
-static gboolean
-is_all_windows_operations_buttons_inactive ()
-{
-        GApplication *application;
-        GList *windows;
-        GList *l;
-        GtkWidget *toolbar;
-
-        application = g_application_get_default ();
-        windows = nautilus_application_get_windows (NAUTILUS_APPLICATION (application));
-
-        for (l = windows; l != NULL; l = l->next) {
-                toolbar = nautilus_window_get_toolbar (NAUTILUS_WINDOW (l->data));
-                if (nautilus_toolbar_is_operations_button_active (NAUTILUS_TOOLBAR (toolbar))) {
-                          return FALSE;
-                }
-        }
-
-        return TRUE;
-}
-
 static void
 on_progress_info_cancelled (NautilusToolbar *self)
 {
         /* Update the pie chart progress */
         gtk_widget_queue_draw (self->priv->operations_icon);
 
-        if (is_all_windows_operations_buttons_inactive ()) {
+        if (!nautilus_progress_manager_has_viewers (self->priv->progress_manager)) {
                 schedule_remove_finished_operations (self);
         }
 }
@@ -526,7 +501,7 @@ on_progress_info_finished (NautilusToolbar      *self,
         /* Update the pie chart progress */
         gtk_widget_queue_draw (self->priv->operations_icon);
 
-        if (is_all_windows_operations_buttons_inactive ()){
+        if (!nautilus_progress_manager_has_viewers (self->priv->progress_manager)) {
                 schedule_remove_finished_operations (self);
         }
 
@@ -747,13 +722,32 @@ on_operations_icon_draw (GtkWidget       *widget,
 }
 
 static void
-on_operations_button_toggled (NautilusToolbar *self)
+on_operations_button_toggled (NautilusToolbar *self,
+                              GtkToggleButton *button)
 {
-        unschedule_remove_finished_operations (self);
-        if (is_all_windows_operations_buttons_inactive ()) {
+        if (gtk_toggle_button_get_active (button)) {
+                unschedule_remove_finished_operations (self);
+                nautilus_progress_manager_add_viewer (self->priv->progress_manager,
+                                                      G_OBJECT (self));
+        }
+        else {
+                nautilus_progress_manager_remove_viewer (self->priv->progress_manager,
+                                                         G_OBJECT (self));
+        }
+}
+
+static void
+on_progress_has_viewers_changed (NautilusProgressInfoManager *manager,
+                                 NautilusToolbar             *self)
+{
+        if (nautilus_progress_manager_has_viewers (manager)) {
+                unschedule_remove_finished_operations (self);
+                return;
+        }
+
+        if (nautilus_progress_manager_are_all_infos_finished_or_cancelled (manager)) {
+                unschedule_remove_finished_operations (self);
                 schedule_remove_finished_operations (self);
-        } else {
-                update_operations (self);
         }
 }
 
@@ -782,6 +776,9 @@ nautilus_toolbar_init (NautilusToolbar *self)
         self->priv->progress_manager = nautilus_progress_info_manager_dup_singleton ();
 	g_signal_connect (self->priv->progress_manager, "new-progress-info",
 			  G_CALLBACK (on_new_progress_info), self);
+        g_signal_connect (self->priv->progress_manager, "has-viewers-changed",
+                          G_CALLBACK (on_progress_has_viewers_changed), self);
+
         update_operations (self);
 
 	g_object_set_data (G_OBJECT (self->priv->back_button), "nav-direction",