aboutsummaryrefslogtreecommitdiff
path: root/src/datetime-prefs.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-03 10:23:06 -0600
committerCharles Kerr <charles.kerr@canonical.com>2012-03-03 10:23:06 -0600
commita7ffebd9859ded9e44ec6a5b5dca9fb771eac209 (patch)
tree281a7dd4cc36debe3a72c7e5f7109d939370b6ad /src/datetime-prefs.c
parent59ade0a5dad1cb85f3576fc89c323a8baceb3a5e (diff)
parentad8b10b4665dbab7a58f0272de9cb3009d0c74b0 (diff)
downloadayatana-indicator-datetime-a7ffebd9859ded9e44ec6a5b5dca9fb771eac209.tar.gz
ayatana-indicator-datetime-a7ffebd9859ded9e44ec6a5b5dca9fb771eac209.tar.bz2
ayatana-indicator-datetime-a7ffebd9859ded9e44ec6a5b5dca9fb771eac209.zip
merging lp:~charlesk/indicator-datetime/fix-833337 and lp:~charlesk/indicator-datetime/fix-leaks
Diffstat (limited to 'src/datetime-prefs.c')
-rw-r--r--src/datetime-prefs.c49
1 files changed, 21 insertions, 28 deletions
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index 9fdfbed..50445ff 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -776,46 +776,39 @@ static void
indicator_datetime_panel_dispose (GObject * object)
{
IndicatorDatetimePanel * self = (IndicatorDatetimePanel *) object;
+ IndicatorDatetimePanelPrivate * priv = self->priv;
- if (self->priv->builder) {
- g_object_unref (self->priv->builder);
- self->priv->builder = NULL;
- }
-
- if (self->priv->proxy) {
- g_object_unref (self->priv->proxy);
- self->priv->proxy = NULL;
- }
+ g_clear_object (&priv->builder);
+ g_clear_object (&priv->proxy);
- if (self->priv->loc_dlg) {
- gtk_widget_destroy (self->priv->loc_dlg);
- self->priv->loc_dlg = NULL;
+ if (priv->loc_dlg) {
+ gtk_widget_destroy (priv->loc_dlg);
+ priv->loc_dlg = NULL;
}
- if (self->priv->save_time_id) {
- g_source_remove (self->priv->save_time_id);
- self->priv->save_time_id = 0;
+ if (priv->save_time_id) {
+ g_source_remove (priv->save_time_id);
+ priv->save_time_id = 0;
}
- if (self->priv->completion) {
- cc_timezone_completion_watch_entry (self->priv->completion, NULL);
- g_object_unref (self->priv->completion);
- self->priv->completion = NULL;
+ if (priv->completion) {
+ cc_timezone_completion_watch_entry (priv->completion, NULL);
+ g_clear_object (&priv->completion);
}
- if (self->priv->tz_entry) {
- gtk_widget_destroy (self->priv->tz_entry);
- self->priv->tz_entry = NULL;
+ if (priv->tz_entry) {
+ gtk_widget_destroy (priv->tz_entry);
+ priv->tz_entry = NULL;
}
- if (self->priv->time_spin) {
- gtk_widget_destroy (self->priv->time_spin);
- self->priv->time_spin = NULL;
+ if (priv->time_spin) {
+ gtk_widget_destroy (priv->time_spin);
+ priv->time_spin = NULL;
}
- if (self->priv->date_spin) {
- gtk_widget_destroy (self->priv->date_spin);
- self->priv->date_spin = NULL;
+ if (priv->date_spin) {
+ gtk_widget_destroy (priv->date_spin);
+ priv->date_spin = NULL;
}
}