From 6fbabd51619c92bcd8584e1bb2f12f2b52904ea6 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 28 Nov 2021 13:19:58 +0100 Subject: Use g_clear_pointer() and g_clear_object() --- mate-panel/panel-menu-items.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'mate-panel/panel-menu-items.c') diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index 1cdc9284..785acee4 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -1265,23 +1265,14 @@ panel_place_menu_item_finalize (GObject *object) { PanelPlaceMenuItem *menuitem = (PanelPlaceMenuItem *) object; - if (menuitem->priv->caja_desktop_settings) { - g_object_unref (menuitem->priv->caja_desktop_settings); - menuitem->priv->caja_desktop_settings = NULL; - } - if (menuitem->priv->caja_prefs_settings) { - g_object_unref (menuitem->priv->caja_prefs_settings); - menuitem->priv->caja_prefs_settings = NULL; - } - - g_object_unref (menuitem->priv->menubar_settings); - menuitem->priv->menubar_settings = NULL; + g_clear_object (&menuitem->priv->caja_desktop_settings); + g_clear_object (&menuitem->priv->caja_prefs_settings); + g_clear_object (&menuitem->priv->menubar_settings); if (menuitem->priv->bookmarks_monitor != NULL) { g_file_monitor_cancel (menuitem->priv->bookmarks_monitor); - g_object_unref (menuitem->priv->bookmarks_monitor); + g_clear_object (&menuitem->priv->bookmarks_monitor); } - menuitem->priv->bookmarks_monitor = NULL; if (menuitem->priv->drive_changed_id) g_signal_handler_disconnect (menuitem->priv->volume_monitor, @@ -1328,9 +1319,7 @@ panel_place_menu_item_finalize (GObject *object) menuitem->priv->mount_removed_id); menuitem->priv->mount_removed_id = 0; - if (menuitem->priv->volume_monitor != NULL) - g_object_unref (menuitem->priv->volume_monitor); - menuitem->priv->volume_monitor = NULL; + g_clear_object (&menuitem->priv->volume_monitor); G_OBJECT_CLASS (panel_place_menu_item_parent_class)->finalize (object); } -- cgit v1.2.1