gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

general: Drop gtk_window_has_toplevel_focus()

Browse source 
It’s identical to gtk_window_is_active() as far as we are concerned.
Also, it's gone in GTK4.
This commit is contained in:
Ernestas Kulik 2018-07-13 13:15:18 +03:00 committed by Ondrej Holy
parent 8576d45c59
commit cd0299b20e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nautilus-progress-persistence-handler.c
View file

@ -184,7 +184,7 @@ progress_info_finished_cb (NautilusProgressInfo *info,
} }
else else
{ {
if ((last_active_window == NULL) || !gtk_window_has_toplevel_focus (last_active_window)) if ((last_active_window == NULL) || !gtk_window_is_active (last_active_window))
{ {
progress_persistence_handler_hide_notification (self); progress_persistence_handler_hide_notification (self);
progress_persistence_handler_show_complete_notification (self); progress_persistence_handler_show_complete_notification (self);

6
src/nautilus-window.c
View file

@ -1587,7 +1587,7 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager,
/* Don't pop up a notification if user canceled the operation or the focus /* Don't pop up a notification if user canceled the operation or the focus
* is not in the this window. This is an easy way to know from which window * is not in the this window. This is an easy way to know from which window
* was the delete operation made */ * was the delete operation made */
if (files != NULL && gtk_window_has_toplevel_focus (GTK_WINDOW (window))) if (files != NULL && gtk_window_is_active (GTK_WINDOW (window)))
{ {
popup_notification = TRUE; popup_notification = TRUE;
label = in_app_notification_undo_deleted_get_label (undo_info); label = in_app_notification_undo_deleted_get_label (undo_info);
@ -1604,7 +1604,7 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager,
* window. This is an easy way to know from which window was the * window. This is an easy way to know from which window was the
* unstart operation made */ * unstart operation made */
if (eel_uri_is_starred (g_file_get_uri (location)) && if (eel_uri_is_starred (g_file_get_uri (location)) &&
gtk_window_has_toplevel_focus (GTK_WINDOW (window)) && gtk_window_is_active (GTK_WINDOW (window)) &&
!nautilus_file_undo_info_starred_is_starred (NAUTILUS_FILE_UNDO_INFO_STARRED (undo_info))) !nautilus_file_undo_info_starred_is_starred (NAUTILUS_FILE_UNDO_INFO_STARRED (undo_info)))
{ {
popup_notification = TRUE; popup_notification = TRUE;
@ -1683,7 +1683,7 @@ nautilus_window_show_operation_notification (NautilusWindow *window,
} }
current_location = nautilus_window_slot_get_location (window->active_slot); current_location = nautilus_window_slot_get_location (window->active_slot);
if (gtk_window_has_toplevel_focus (GTK_WINDOW (window))) if (gtk_window_is_active (GTK_WINDOW (window)))
{ {
remove_notifications (window); remove_notifications (window);
gtk_label_set_text (GTK_LABEL (window->notification_operation_label), gtk_label_set_text (GTK_LABEL (window->notification_operation_label),