[libdazzle/libdazzle-3-28] dock-manager: release grab on finalize



commit c670d65bd9b48c3ffeca467a011b4104374b3baa
Author: Christian Hergert <chergert redhat com>
Date:   Sat Jul 28 00:33:32 2018 -0700

    dock-manager: release grab on finalize
    
    # Conflicts:
    #       src/panel/dzl-dock-manager.c

 src/panel/dzl-dock-manager.c | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/src/panel/dzl-dock-manager.c b/src/panel/dzl-dock-manager.c
index 0f56af1..6c932e5 100644
--- a/src/panel/dzl-dock-manager.c
+++ b/src/panel/dzl-dock-manager.c
@@ -108,6 +108,8 @@ dzl_dock_manager_do_set_focus (DzlDockManager *self,
       g_clear_object (&priv->grab);
     }
 
+  g_assert (priv->grab == NULL);
+
   /* Start the grab process */
   if (grab != NULL)
     {
@@ -268,6 +270,8 @@ dzl_dock_manager_finalize (GObject *object)
   DzlDockManager *self = (DzlDockManager *)object;
   DzlDockManagerPrivate *priv = dzl_dock_manager_get_instance_private (self);
 
+  g_clear_object (&priv->grab);
+
   g_clear_pointer (&priv->queued_focus_by_toplevel, g_hash_table_unref);
 
   if (priv->queued_handler)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]