[gnome-control-center] datetime: Use g_clear_object()
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] datetime: Use g_clear_object()
- Date: Thu, 8 Aug 2013 10:03:17 +0000 (UTC)
commit e665689e23b9497ba71bf3e03dae9062d09723d9
Author: Kalev Lember <kalevlember gmail com>
Date: Thu Aug 8 11:08:40 2013 +0200
datetime: Use g_clear_object()
https://bugzilla.gnome.org/show_bug.cgi?id=694985
panels/datetime/cc-datetime-panel.c | 43 +++++-----------------------------
1 files changed, 7 insertions(+), 36 deletions(-)
---
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index ef681b8..b384b11 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -124,48 +124,19 @@ cc_date_time_panel_dispose (GObject *object)
{
CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (object)->priv;
- if (priv->clock_tracker != NULL)
- {
- g_object_unref (priv->clock_tracker);
- priv->clock_tracker = NULL;
- }
-
- if (priv->builder)
- {
- g_object_unref (priv->builder);
- priv->builder = NULL;
- }
-
- if (priv->settings)
- {
- g_object_unref (priv->settings);
- priv->settings = NULL;
- }
-
- if (priv->date)
- {
- g_date_time_unref (priv->date);
- priv->date = NULL;
- }
-
if (priv->cancellable)
{
g_cancellable_cancel (priv->cancellable);
- g_object_unref (priv->cancellable);
- priv->cancellable = NULL;
+ g_clear_object (&priv->cancellable);
}
- if (priv->dtm)
- {
- g_object_unref (priv->dtm);
- priv->dtm = NULL;
- }
+ g_clear_object (&priv->builder);
+ g_clear_object (&priv->clock_tracker);
+ g_clear_object (&priv->dtm);
+ g_clear_object (&priv->permission);
+ g_clear_object (&priv->settings);
- if (priv->permission)
- {
- g_object_unref (priv->permission);
- priv->permission = NULL;
- }
+ g_clear_pointer (&priv->date, g_date_time_unref);
G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]