[gnome-control-center] info: Use g_clear_object()
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] info: Use g_clear_object()
- Date: Mon, 15 Apr 2013 14:00:47 +0000 (UTC)
commit 4956af4a7062bfa888f9ad97fc18986621b0d573
Author: Kalev Lember <kalevlember gmail com>
Date: Fri Apr 12 23:08:02 2013 +0200
info: Use g_clear_object()
panels/info/cc-info-panel.c | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
index 1a8bc41..453b8a6 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
@@ -457,29 +457,10 @@ cc_info_panel_dispose (GObject *object)
{
CcInfoPanelPrivate *priv = CC_INFO_PANEL (object)->priv;
- if (priv->builder != NULL)
- {
- g_object_unref (priv->builder);
- priv->builder = NULL;
- }
-
- if (priv->pk_proxy != NULL)
- {
- g_object_unref (priv->pk_proxy);
- priv->pk_proxy = NULL;
- }
-
- if (priv->pk_transaction_proxy != NULL)
- {
- g_object_unref (priv->pk_transaction_proxy);
- priv->pk_transaction_proxy = NULL;
- }
-
- if (priv->graphics_data != NULL)
- {
- graphics_data_free (priv->graphics_data);
- priv->graphics_data = NULL;
- }
+ g_clear_object (&priv->builder);
+ g_clear_object (&priv->pk_proxy);
+ g_clear_object (&priv->pk_transaction_proxy);
+ g_clear_pointer (&priv->graphics_data, graphics_data_free);
G_OBJECT_CLASS (cc_info_panel_parent_class)->dispose (object);
}
@@ -1638,8 +1619,7 @@ on_pk_transaction_signal (GDBusProxy *proxy,
}
else if (g_strcmp0 (signal_name, "Destroy") == 0)
{
- g_object_unref (self->priv->pk_transaction_proxy);
- self->priv->pk_transaction_proxy = NULL;
+ g_clear_object (&self->priv->pk_transaction_proxy);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]