mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-21 04:10:43 +02:00
2007-09-06 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c - (nm_manager_user_connections_destroy): clear the user connections hash table, don't destroy it - (finalize): only destroy the hash table on NMManager finalization git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2765 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
d1ac371963
commit
8af139dff4
2 changed files with 11 additions and 4 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2007-09-06 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-manager.c
|
||||
- (nm_manager_user_connections_destroy): clear the user connections hash
|
||||
table, don't destroy it
|
||||
- (finalize): only destroy the hash table on NMManager finalization
|
||||
|
||||
2007-09-02 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* include/NetworkManager.h
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@ finalize (GObject *object)
|
|||
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
|
||||
|
||||
nm_manager_user_connections_destroy (manager);
|
||||
g_hash_table_destroy (priv->user_connections);
|
||||
priv->user_connections = NULL;
|
||||
|
||||
while (g_slist_length (priv->devices))
|
||||
nm_manager_remove_device (manager, NM_DEVICE (priv->devices->data));
|
||||
|
|
@ -506,10 +508,8 @@ nm_manager_user_connections_destroy (NMManager *manager)
|
|||
{
|
||||
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
|
||||
|
||||
if (priv->user_connections) {
|
||||
g_hash_table_destroy (priv->user_connections);
|
||||
priv->user_connections = NULL;
|
||||
}
|
||||
if (priv->user_connections)
|
||||
g_hash_table_remove_all (priv->user_connections);
|
||||
|
||||
if (priv->user_proxy) {
|
||||
g_object_unref (priv->user_proxy);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue