[gnome-control-center/gnome-3-4] bluetooth: Don't use g_clear_pointer()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-4] bluetooth: Don't use g_clear_pointer()
- Date: Mon, 24 Sep 2012 15:39:31 +0000 (UTC)
commit 2a28c65af8acbdfeb09cb1cbb7109cdde17aa948
Author: Bastien Nocera <hadess hadess net>
Date: Mon Sep 24 17:38:35 2012 +0200
bluetooth: Don't use g_clear_pointer()
It's GLib 2.34 release, and GNOME 3.4 shipped with Glib 2.32.
https://bugzilla.gnome.org/show_bug.cgi?id=684717
panels/bluetooth/cc-bluetooth-panel.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c
index f1d44f5..78f68fe 100644
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -104,8 +104,10 @@ cc_bluetooth_panel_finalize (GObject *object)
g_object_unref (self->priv->client);
self->priv->client = NULL;
}
-
- g_clear_pointer (&self->priv->selected_bdaddr, g_free);
+ if (self->priv->selected_bdaddr) {
+ g_free (self->priv->selected_bdaddr);
+ self->priv->selected_bdaddr = NULL;
+ }
G_OBJECT_CLASS (cc_bluetooth_panel_parent_class)->finalize (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]