From 5827f3aa2aed9cfb6d5a55e0c0ba99a8355ba653 Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Mon, 9 Jun 2008 08:19:09 +0000 Subject: [PATCH] 2008-06-09 Tambet Ingo * src/dhcp-manager/nm-dhcp-manager.c (finalize): Free private members. (nm_dhcp_device_destroy): Destroy the device options hash table. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3733 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/dhcp-manager/nm-dhcp-manager.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f41bdca04f..7849df5a0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-09 Tambet Ingo + + * src/dhcp-manager/nm-dhcp-manager.c (finalize): Free private members. + (nm_dhcp_device_destroy): Destroy the device options hash table. + 2008-06-06 Dan Williams * system-settings/src/nm-polkit-helpers.c diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 508a3f6561..282ce78e5e 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -140,6 +140,12 @@ nm_dhcp_manager_init (NMDHCPManager *manager) static void finalize (GObject *object) { + NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object); + + g_hash_table_destroy (priv->devices); + g_object_unref (priv->proxy); + g_object_unref (priv->dbus_mgr); + G_OBJECT_CLASS (nm_dhcp_manager_parent_class)->finalize (object); } @@ -211,7 +217,7 @@ nm_dhcp_device_destroy (NMDHCPDevice *device) { nm_dhcp_device_timeout_cleanup (device); nm_dhcp_device_watch_cleanup (device); - g_hash_table_remove_all (device->options); + g_hash_table_destroy (device->options); g_free (device->iface); g_slice_free (NMDHCPDevice, device); }