[devhelp] Use g_set/clear_weak_pointer()
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] Use g_set/clear_weak_pointer()
- Date: Tue, 24 Dec 2019 06:42:57 +0000 (UTC)
commit ee8d84ff5f13d793f4bcb3ed3ac616d4f67cfef9
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Dec 24 07:36:14 2019 +0100
Use g_set/clear_weak_pointer()
devhelp/dh-tab-label.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/devhelp/dh-tab-label.c b/devhelp/dh-tab-label.c
index 98879ad5..322c9176 100644
--- a/devhelp/dh-tab-label.c
+++ b/devhelp/dh-tab-label.c
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/*
- * SPDX-FileCopyrightText: 2018 Sébastien Wilmet <swilmet gnome org>
+/* SPDX-FileCopyrightText: 2018-2019 Sébastien Wilmet <swilmet gnome org>
* SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -69,9 +68,7 @@ set_tab (DhTabLabel *tab_label,
g_return_if_fail (DH_IS_TAB (tab));
g_assert (tab_label->priv->tab == NULL);
- tab_label->priv->tab = tab;
- g_object_add_weak_pointer (G_OBJECT (tab_label->priv->tab),
- (gpointer *) &tab_label->priv->tab);
+ g_set_weak_pointer (&tab_label->priv->tab, tab);
web_view = dh_tab_get_web_view (tab);
g_signal_connect_object (web_view,
@@ -126,11 +123,7 @@ dh_tab_label_dispose (GObject *object)
{
DhTabLabel *tab_label = DH_TAB_LABEL (object);
- if (tab_label->priv->tab != NULL) {
- g_object_remove_weak_pointer (G_OBJECT (tab_label->priv->tab),
- (gpointer *) &tab_label->priv->tab);
- tab_label->priv->tab = NULL;
- }
+ g_clear_weak_pointer (&tab_label->priv->tab);
G_OBJECT_CLASS (dh_tab_label_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]