[geary/wip/713739-inline: 8/37] Maintain focus when composer is popped out

[Jim Nelson <jnelson src gnome org>]

commit 4d3e9b246156d50eaba0d2f68f0e2427ad455908
Author: Robert Schroll <rschroll gmail com>
Date:   Sun Jun 23 22:48:29 2013 -0400

    Maintain focus when composer is popped out
    
    The selection isn't, though.

 src/client/composer/composer-embed.vala |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/client/composer/composer-embed.vala b/src/client/composer/composer-embed.vala
index 084c4ad..d42af66 100644
--- a/src/client/composer/composer-embed.vala
+++ b/src/client/composer/composer-embed.vala
@@ -117,8 +117,13 @@ public class ComposerEmbed : Gtk.Box, ComposerContainer {
             on_focus_out();
         composer.editor.focus_in_event.disconnect(on_focus_in);
         composer.editor.focus_out_event.disconnect(on_focus_out);
+        Gtk.Widget focus = top_window.get_focus();
+        
         remove(composer);
-        new ComposerWindow(composer);
+        ComposerWindow window = new ComposerWindow(composer);
+        ComposerWindow focus_win = focus.get_toplevel() as ComposerWindow;
+        if (focus_win != null && focus_win == window)
+            focus.grab_focus();
         composer = null;
         close();
     }