diff options
| author | rbuj <[email protected]> | 2021-11-28 13:19:58 +0100 |
|---|---|---|
| committer | Luke from DC <[email protected]> | 2021-12-16 06:52:11 +0000 |
| commit | 6fbabd51619c92bcd8584e1bb2f12f2b52904ea6 (patch) | |
| tree | 540229310cf7f6d6b60e82fcd2952a6caec31a4a /mate-panel/libpanel-util | |
| parent | 94f3ec8c654363cd6a245eb9dca7c54f1b8f5649 (diff) | |
| download | mate-panel-6fbabd51619c92bcd8584e1bb2f12f2b52904ea6.tar.bz2 mate-panel-6fbabd51619c92bcd8584e1bb2f12f2b52904ea6.tar.xz | |
Use g_clear_pointer() and g_clear_object()
Diffstat (limited to 'mate-panel/libpanel-util')
| -rw-r--r-- | mate-panel/libpanel-util/panel-icon-chooser.c | 20 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-keyfile.c | 3 | ||||
| -rw-r--r-- | mate-panel/libpanel-util/panel-session-manager.c | 3 |
3 files changed, 7 insertions, 19 deletions
diff --git a/mate-panel/libpanel-util/panel-icon-chooser.c b/mate-panel/libpanel-util/panel-icon-chooser.c index 1e6c0ca3..c99503bd 100644 --- a/mate-panel/libpanel-util/panel-icon-chooser.c +++ b/mate-panel/libpanel-util/panel-icon-chooser.c @@ -153,17 +153,9 @@ panel_icon_chooser_dispose (GObject *object) /* remember, destroy can be run multiple times! */ - if (chooser->priv->fallback_icon_name != NULL) - g_free (chooser->priv->fallback_icon_name); - chooser->priv->fallback_icon_name = NULL; - - if (chooser->priv->icon != NULL) - g_free (chooser->priv->icon); - chooser->priv->icon = NULL; - - if (chooser->priv->icon_theme_dir != NULL) - g_free (chooser->priv->icon_theme_dir); - chooser->priv->icon_theme_dir = NULL; + g_clear_pointer (&chooser->priv->fallback_icon_name, g_free); + g_clear_pointer (&chooser->priv->icon, g_free); + g_clear_pointer (&chooser->priv->icon_theme_dir, g_free); G_OBJECT_CLASS (panel_icon_chooser_parent_class)->dispose (object); } @@ -504,8 +496,7 @@ panel_icon_chooser_set_fallback_icon_name (PanelIconChooser *chooser, if (g_strcmp0 (chooser->priv->fallback_icon_name, fallback_icon_name) == 0) return; - if (chooser->priv->fallback_icon_name) - g_free (chooser->priv->fallback_icon_name); + g_free (chooser->priv->fallback_icon_name); chooser->priv->fallback_icon_name = g_strdup (fallback_icon_name); _panel_icon_chooser_update (chooser); @@ -530,8 +521,7 @@ panel_icon_chooser_set_icon (PanelIconChooser *chooser, if (g_strcmp0 (chooser->priv->icon, icon) == 0) return; - if (chooser->priv->icon) - g_free (chooser->priv->icon); + g_free (chooser->priv->icon); chooser->priv->icon = g_strdup (icon); _panel_icon_chooser_update (chooser); diff --git a/mate-panel/libpanel-util/panel-keyfile.c b/mate-panel/libpanel-util/panel-keyfile.c index 2b58dc3a..0b0104ef 100644 --- a/mate-panel/libpanel-util/panel-keyfile.c +++ b/mate-panel/libpanel-util/panel-keyfile.c @@ -293,8 +293,7 @@ panel_key_file_remove_locale_key (GKeyFile *keyfile, locale_key, NULL)) break; - g_free (locale_key); - locale_key = NULL; + g_clear_pointer (&locale_key, g_free); } } diff --git a/mate-panel/libpanel-util/panel-session-manager.c b/mate-panel/libpanel-util/panel-session-manager.c index afd09501..a4a17862 100644 --- a/mate-panel/libpanel-util/panel-session-manager.c +++ b/mate-panel/libpanel-util/panel-session-manager.c @@ -39,8 +39,7 @@ panel_session_manager_finalize (GObject *object) { PanelSessionManager *manager = PANEL_SESSION_MANAGER (object); - if (manager->proxy != NULL) - g_object_unref (manager->proxy); + g_clear_object (&manager->proxy); G_OBJECT_CLASS (panel_session_manager_parent_class)->finalize (object); } |