Merge lp:~robert-ancell/unity-greeter/focus-crash into lp:unity-greeter

[Robert Ancell]

Handle a window being destroyed after we get the map event and try and focus it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1114
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/32/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2013-11-08 18:07:31 +0000
+++ src/unity-greeter.vala	2014-02-04 17:00:31 +0000
@@ -304,19 +304,21 @@
             var display = Gdk.x11_lookup_xdisplay (xevent.xmap.display);
             var xwin = xevent.xmap.window;
             var win = Gdk.X11Window.foreign_new_for_display (display, xwin);
-
-            /* Check to see if this window is our onboard window, since we don't want to focus it. */
-            X.Window keyboard_xid = 0;
-            if (main_window.menubar.keyboard_window != null)
-                keyboard_xid = Gdk.X11Window.get_xid (main_window.menubar.keyboard_window.get_window ());
-
-            if (xwin != keyboard_xid && win.get_type_hint() != Gdk.WindowTypeHint.NOTIFICATION)
+            if (win != null)
             {
-                win.focus (Gdk.CURRENT_TIME);
-
-                /* Make sure to keep keyboard above */
+                /* Check to see if this window is our onboard window, since we don't want to focus it. */
+                X.Window keyboard_xid = 0;
                 if (main_window.menubar.keyboard_window != null)
-                    main_window.menubar.keyboard_window.get_window ().raise ();
+                    keyboard_xid = Gdk.X11Window.get_xid (main_window.menubar.keyboard_window.get_window ());
+
+                if (xwin != keyboard_xid && win.get_type_hint() != Gdk.WindowTypeHint.NOTIFICATION)
+                {
+                    win.focus (Gdk.CURRENT_TIME);
+
+                    /* Make sure to keep keyboard above */
+                    if (main_window.menubar.keyboard_window != null)
+                        main_window.menubar.keyboard_window.get_window ().raise ();
+                }
             }
         }
         else if (xevent.type == X.EventType.UnmapNotify)