Merge branch 'main' into leneemter/sort-windows

Author: lenemter

po/hu.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-02-10 20:55+0000\n"
-"PO-Revision-Date: 2025-01-16 17:55+0000\n"
+"PO-Revision-Date: 2025-02-21 19:16+0000\n"
 "Last-Translator: TomiOhl <[email protected]>\n"
 "Language-Team: Hungarian <https://l10n.elementary.io/projects/desktop/gala/"
 "hu/>\n"
@@ -301,11 +301,11 @@ msgstr "Képernyőkép %s"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot is saved to clipboard"
-msgstr ""
+msgstr "Képernyőkép mentve a vágólapra"
 
 #: src/WindowManager.vala:2375
 msgid "Screenshot saved to screenshots folder"
-msgstr ""
+msgstr "Képernyőkép mentve a Képernyőképek mappába"
 
 #~ msgid ""
 #~ "Set the keyboard layout correctly at startup so that the indicator "

src/DesktopIntegration.vala

@@ -21,7 +21,7 @@ public class Gala.DesktopIntegration : GLib.Object {
     public signal void windows_changed ();
     public signal void active_workspace_changed ();
     public signal void workspace_removed (int index);
-    
+
     private unowned WindowManagerGala wm;
     private GLib.HashTable<Meta.Window, int64?> time_appeared_on_workspace;
 
@@ -56,6 +56,8 @@ public class Gala.DesktopIntegration : GLib.Object {
             window.unmanaging.connect ((_window) => {
                 time_appeared_on_workspace.remove (_window);
             });
+
+            window.workspace_changed.connect (() => windows_changed ());
         });
     }
 

src/Gestures/ToucheggBackend.vala

@@ -200,19 +200,19 @@ public class Gala.ToucheggBackend : Object, GestureBackend {
                     on_gesture_detected (make_gesture (type, direction, fingers, performed_on_device_type), Meta.CURRENT_TIME);
                     on_begin (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             case DBUS_ON_GESTURE_UPDATE:
                 Idle.add (() => {
                     on_update (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             case DBUS_ON_GESTURE_END:
                 Idle.add (() => {
                     on_end (delta, elapsed_time);
                     return false;
-                });
+                }, Priority.DEFAULT);
                 break;
             default:
                 break;

src/WorkspaceManager.vala

@@ -120,7 +120,7 @@ public class Gala.WorkspaceManager : Object {
             // or else things might get broke
             DragDropAction.cancel_all_by_id ("multitaskingview-window");
 
-            remove_workspace (prev_workspace);
+            queue_remove_workspace (prev_workspace);
         }
     }
 
@@ -178,7 +178,7 @@ public class Gala.WorkspaceManager : Object {
             && Utils.get_n_windows (workspace, true, window) == 0
             && workspace != last_workspace
         ) {
-            remove_workspace (workspace);
+            queue_remove_workspace (workspace);
         }
 
         // if window is the second last and empty, make it the last workspace
@@ -187,7 +187,7 @@ public class Gala.WorkspaceManager : Object {
             && Utils.get_n_windows (workspace, true, window) == 0
             && workspace.index () == last_workspace_index - 1
         ) {
-            remove_workspace (last_workspace);
+            queue_remove_workspace (last_workspace);
         }
     }
 
@@ -221,12 +221,27 @@ public class Gala.WorkspaceManager : Object {
         manager.append_new_workspace (false, display.get_current_time ());
     }
 
+    private void queue_remove_workspace (Meta.Workspace workspace) {
+        // workspace has already been removed
+        if (workspace in workspaces_marked_removed) {
+            return;
+        }
+
+        workspaces_marked_removed.add (workspace);
+
+        // We might be here because of a signal emition from the ws machinery (e.g. workspace.window_removed).
+        // Often the function emitting the signal doesn't take a ref on the ws so if we remove it right
+        // away it will be freed. But because the function often accesses it after the singal emition this leads
+        // to warnings and in some cases a crash.
+        Idle.add (() => remove_workspace (workspace));
+    }
+
     /**
      * Make sure we switch to a different workspace and remove the given one
      *
      * @param workspace The workspace to remove
      */
-    private void remove_workspace (Meta.Workspace workspace) {
+    private bool remove_workspace (Meta.Workspace workspace) {
         unowned Meta.Display display = workspace.get_display ();
         unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
         var time = display.get_current_time ();
@@ -246,17 +261,12 @@ public class Gala.WorkspaceManager : Object {
             }
         }
 
-        // workspace has already been removed
-        if (workspace in workspaces_marked_removed) {
-            return;
-        }
-
         workspace.window_added.disconnect (queue_window_added);
         workspace.window_removed.disconnect (window_removed);
 
-        workspaces_marked_removed.add (workspace);
-
         manager.remove_workspace (workspace, time);
+
+        return Source.REMOVE;
     }
 
     /**
@@ -292,7 +302,7 @@ public class Gala.WorkspaceManager : Object {
         foreach (var workspace in manager.get_workspaces ()) {
             var last_index = manager.get_n_workspaces () - 1;
             if (Utils.get_n_windows (workspace) == 0 && workspace.index () != last_index) {
-                remove_workspace (workspace);
+                queue_remove_workspace (workspace);
             }
         }
     }