[libdazzle] shortcuts: use g_clear_weak_pointer() and g_set_weak_pointer()



commit e651c52ecb3adf6e374674c6637778f6ed2fbe66
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jul 25 19:35:11 2018 -0700

    shortcuts: use g_clear_weak_pointer() and g_set_weak_pointer()

 src/shortcuts/dzl-shortcut-controller.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/shortcuts/dzl-shortcut-controller.c b/src/shortcuts/dzl-shortcut-controller.c
index 7efb670..dd0754a 100644
--- a/src/shortcuts/dzl-shortcut-controller.c
+++ b/src/shortcuts/dzl-shortcut-controller.c
@@ -371,14 +371,12 @@ dzl_shortcut_controller_set_widget (DzlShortcutController *self,
       if (priv->widget != NULL)
         {
           dzl_shortcut_controller_disconnect (self);
-          g_object_remove_weak_pointer (G_OBJECT (priv->widget), (gpointer *)&priv->widget);
-          priv->widget = NULL;
+          g_clear_weak_pointer (&priv->widget);
         }
 
       if (widget != NULL && widget != priv->widget)
         {
-          priv->widget = widget;
-          g_object_add_weak_pointer (G_OBJECT (priv->widget), (gpointer *)&priv->widget);
+          g_set_weak_pointer (&priv->widget, widget);
           dzl_shortcut_controller_connect (self);
         }
 


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