caja-progress-info: new behavior with notifications:

sc0w · sc0w · commit 75e89ca629a0 · 2018-12-27T12:35:47.000+01:00
- remove the "Working..." notification

- show the "Process completed" notification only if the progress window is inactive
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
@@ -623,14 +623,14 @@ update_status_icon_and_window (void)
 
         if (window_shown)
         {
-            gtk_widget_hide (get_progress_window ());
-
-            if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS))
+            if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS) &&
+                !gtk_window_is_active (GTK_WINDOW (get_progress_window ())))
             {
                 g_notification_set_body (notification, _("Process completed"));
                 g_application_send_notification (g_application_get_default (), "caja", notification);
             }
 
+            gtk_widget_hide (get_progress_window ());
             window_shown = FALSE;
         }
     }
@@ -639,13 +639,6 @@ update_status_icon_and_window (void)
         gtk_widget_show_all (get_progress_window ());
         gtk_status_icon_set_visible (status_icon, TRUE);
         gtk_window_present (GTK_WINDOW (get_progress_window ()));
-
-        if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS))
-        {
-            g_notification_set_body (notification, _("Working..."));
-            g_application_send_notification (g_application_get_default (), "caja", notification);
-        }
-
         window_shown = TRUE;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -623,14 +623,14 @@ update_status_icon_and_window (void)`
`623`	`623`
`624`	`624`	`if (window_shown)`
`625`	`625`	`{`
`626`		`- gtk_widget_hide (get_progress_window ());`
`627`		`-`
`628`		`- if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS))`
	`626`	`+ if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS) &&`
	`627`	`+ !gtk_window_is_active (GTK_WINDOW (get_progress_window ())))`
`629`	`628`	`{`
`630`	`629`	`g_notification_set_body (notification, _("Process completed"));`
`631`	`630`	`g_application_send_notification (g_application_get_default (), "caja", notification);`
`632`	`631`	`}`
`633`	`632`
	`633`	`+ gtk_widget_hide (get_progress_window ());`
`634`	`634`	`window_shown = FALSE;`
`635`	`635`	`}`
`636`	`636`	`}`
`@@ -639,13 +639,6 @@ update_status_icon_and_window (void)`
`639`	`639`	`gtk_widget_show_all (get_progress_window ());`
`640`	`640`	`gtk_status_icon_set_visible (status_icon, TRUE);`
`641`	`641`	`gtk_window_present (GTK_WINDOW (get_progress_window ()));`
`642`		`-`
`643`		`- if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_NOTIFICATIONS))`
`644`		`- {`
`645`		`- g_notification_set_body (notification, _("Working..."));`
`646`		`- g_application_send_notification (g_application_get_default (), "caja", notification);`
`647`		`- }`
`648`		`-`
`649`	`642`	`window_shown = TRUE;`
`650`	`643`	`}`
`651`	`644`	`}`