[libdazzle] panel: share branch for steal/release previous grab

[Christian Hergert <chergert src gnome org>]

commit 90a454ca4ad2d52ecd1f8ab0dfe82ee9f0938e37
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 24 15:29:21 2017 -0700

    panel: share branch for steal/release previous grab

 src/panel/dzl-dock-manager.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/src/panel/dzl-dock-manager.c b/src/panel/dzl-dock-manager.c
index fdb375a..ebe9af6 100644
--- a/src/panel/dzl-dock-manager.c
+++ b/src/panel/dzl-dock-manager.c
@@ -81,15 +81,12 @@ dzl_dock_manager_do_set_focus (DzlDockManager *self,
 
   /*
    * Steal common hierarchy so that we don't hide it when breaking grabs.
-   */
-  if (priv->grab != NULL && grab != NULL)
-    dzl_dock_transient_grab_steal_common_ancestors (grab, priv->grab);
-
-  /*
-   * Release the previous grab.
+   * Then release our previous grab.
    */
   if (priv->grab != NULL)
     {
+      if (grab != NULL)
+        dzl_dock_transient_grab_steal_common_ancestors (grab, priv->grab);
       dzl_dock_transient_grab_release (priv->grab);
       g_clear_object (&priv->grab);
     }