Merge lp:~gala-dev/gala/actor-guards into lp:gala

[Rico Tzschichholz]

[Felipe Escoto (philip.scott)]

Fixes the crashes I was having associated with that bug! Thank you :)

review: Approve

[Santiago (santileortiz)]

review: Approve

=== modified file 'plugins/notify/NormalNotification.vala'
--- plugins/notify/NormalNotification.vala	2015-02-09 22:10:34 +0000
+++ plugins/notify/NormalNotification.vala	2016-08-04 08:35:39 +0000
@@ -284,9 +284,9 @@
 
 			// if no default action has been set, we fallback to trying to find a window for the
 			// notification's sender process
-			var window = get_window ();
+			unowned Meta.Window? window = get_window ();
 			if (window != null) {
-				var workspace = window.get_workspace ();
+				unowned Meta.Workspace workspace = window.get_workspace ();
 				var time = screen.get_display ().get_current_time ();
 
 				if (workspace != screen.get_active_workspace ())
@@ -298,13 +298,16 @@
 			}
 		}
 
-		Window? get_window ()
+		unowned Meta.Window? get_window ()
 		{
 			if (sender_pid == 0)
 				return null;
 
-			foreach (var actor in Compositor.get_window_actors (screen)) {
-				var window = actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+				if (actor.is_destroyed ())
+					continue;
+
+				unowned Meta.Window window = actor.get_meta_window ();
 
 				// the windows are sorted by stacking order when returned
 				// from meta_get_window_actors, so we can just pick the first
 
=== modified file 'src/InternalUtils.vala'
--- src/InternalUtils.vala	2015-03-04 11:29:53 +0000
+++ src/InternalUtils.vala	2016-08-04 08:35:39 +0000
@@ -149,8 +149,8 @@
 
 			new_window.change_workspace_by_index (index, false);
 
-			foreach (var actor in actors) {
-				var window = actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor actor in actors) {
+				unowned Meta.Window window = actor.get_meta_window ();
 				var window_index = window.get_workspace ().index ();
 
 				if (!window.on_all_workspaces
 
=== modified file 'src/Widgets/MonitorClone.vala'
--- src/Widgets/MonitorClone.vala	2015-11-11 19:56:40 +0000
+++ src/Widgets/MonitorClone.vala	2016-08-04 08:35:39 +0000
@@ -56,8 +56,11 @@
 			screen.window_entered_monitor.connect (window_entered);
 			screen.window_left_monitor.connect (window_left);
 
-			foreach (var window_actor in Compositor.get_window_actors (screen)) {
-				var window = window_actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor window_actor in Meta.Compositor.get_window_actors (screen)) {
+				if (window_actor.is_destroyed ())
+					continue;
+
+				unowned Meta.Window window = window_actor.get_meta_window ();
 				if (window.get_monitor () == monitor) {
 					window_entered (monitor, window);
 				}
 
=== modified file 'src/Widgets/MultitaskingView.vala'
--- src/Widgets/MultitaskingView.vala	2016-04-25 12:41:53 +0000
+++ src/Widgets/MultitaskingView.vala	2016-08-04 08:35:39 +0000
@@ -504,12 +504,13 @@
 			dock_clones.get_transformed_position (out clone_offset_x, out clone_offset_y);
 
 			if (opening) {
-				unowned List<WindowActor> actors = Compositor.get_window_actors (screen);
-
-				foreach (var actor in actors) {
+				foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
 					const int MAX_OFFSET = 100;
 
-					var window = actor.get_meta_window ();
+					if (actor.is_destroyed ())
+						continue;
+
+					unowned Meta.Window window = actor.get_meta_window ();
 					var monitor = window.get_monitor ();
 
 					if (window.window_type != WindowType.DOCK)
 
=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2015-11-11 19:00:26 +0000
+++ src/Widgets/WindowSwitcher.vala	2016-08-04 08:35:39 +0000
@@ -430,10 +430,11 @@
 			window_clones.destroy_all_children ();
 
 			// need to go through all the windows because of hidden dialogs
-			unowned List<WindowActor>? window_actors = Compositor.get_window_actors (screen);
-			foreach (var actor in window_actors) {
-				unowned Window window = actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+				if (actor.is_destroyed ())
+					continue;
 
+				unowned Meta.Window window = actor.get_meta_window ();
 				if (window.get_workspace () == workspace
 					&& window.showing_on_its_workspace ())
 					actor.show ();
@@ -620,8 +621,11 @@
 				current_window = (WindowIcon) dock.get_child_at_index (0);
 
 			// hide the others
-			foreach (var actor in Compositor.get_window_actors (screen)) {
-				var window = actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+				if (actor.is_destroyed ())
+					continue;
+
+				unowned Meta.Window window = actor.get_meta_window ();
 				var type = window.window_type;
 
 				if (type != WindowType.DOCK
 
=== modified file 'src/WindowListener.vala'
--- src/WindowListener.vala	2015-11-11 19:56:40 +0000
+++ src/WindowListener.vala	2016-08-04 08:35:39 +0000
@@ -36,9 +36,11 @@
 
 			instance = new WindowListener ();
 
-			foreach (var actor in Compositor.get_window_actors (screen)) {
-				var window = actor.get_meta_window ();
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
+				if (actor.is_destroyed ())
+					continue;
 
+				unowned Meta.Window window = actor.get_meta_window ();
 				if (window.window_type == WindowType.NORMAL)
 					instance.monitor_window (window);
 			}
 
=== modified file 'src/WindowManager.vala'
--- src/WindowManager.vala	2016-08-03 11:14:55 +0000
+++ src/WindowManager.vala	2016-08-04 08:35:39 +0000
@@ -1427,11 +1427,11 @@
 			var docks = new List<WindowActor> ();
 
 			// collect all windows and put them in the appropriate containers
-			foreach (var actor in Compositor.get_window_actors (screen)) {
+			foreach (unowned Meta.WindowActor actor in Meta.Compositor.get_window_actors (screen)) {
 				if (actor.is_destroyed ())
 					continue;
 
-				var window = actor.get_meta_window ();
+				unowned Meta.Window window = actor.get_meta_window ();
 
 				if (!window.showing_on_its_workspace () ||
 					(move_primary_only && window.get_monitor () != primary) ||