diff options
| -rw-r--r-- | src/ip6-manager/nm-ip6-manager.c | 1 | ||||
| -rw-r--r-- | src/nm-device-adsl.c | 5 | ||||
| -rw-r--r-- | src/nm-device-vlan.c | 2 | ||||
| -rw-r--r-- | src/nm-device-wired.c | 5 | ||||
| -rw-r--r-- | src/nm-netlink-monitor.c | 7 |
5 files changed, 1 insertions, 19 deletions
diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c index 0a1104b40c..9c9c2c918e 100644 --- a/src/ip6-manager/nm-ip6-manager.c +++ b/src/ip6-manager/nm-ip6-manager.c @@ -1654,7 +1654,6 @@ finalize (GObject *object) g_signal_handler_disconnect (priv->monitor, priv->netlink_id); g_hash_table_destroy (priv->devices); - g_object_unref (priv->monitor); nl_cache_free (priv->addr_cache); nl_cache_free (priv->route_cache); diff --git a/src/nm-device-adsl.c b/src/nm-device-adsl.c index e4fc2cf0eb..3cfa2e9efc 100644 --- a/src/nm-device-adsl.c +++ b/src/nm-device-adsl.c @@ -725,11 +725,6 @@ dispose (GObject *object) priv->netlink_id = 0; } - if (priv->monitor) { - g_object_unref (priv->monitor); - priv->monitor = NULL; - } - g_free (priv->nas_ifname); priv->nas_ifname = NULL; diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c index 3f60178a80..0763d31749 100644 --- a/src/nm-device-vlan.c +++ b/src/nm-device-vlan.c @@ -572,8 +572,6 @@ dispose (GObject *object) if (priv->link_disconnected_id) g_signal_handler_disconnect (priv->monitor, priv->link_disconnected_id); - g_object_unref (priv->monitor); - g_signal_handler_disconnect (priv->parent, priv->parent_state_id); g_object_unref (priv->parent); diff --git a/src/nm-device-wired.c b/src/nm-device-wired.c index 7bb19b0ad8..4034d3880e 100644 --- a/src/nm-device-wired.c +++ b/src/nm-device-wired.c @@ -344,11 +344,6 @@ dispose (GObject *object) priv->link_disconnected_id = 0; } - if (priv->monitor) { - g_object_unref (priv->monitor); - priv->monitor = NULL; - } - G_OBJECT_CLASS (nm_device_wired_parent_class)->dispose (object); } diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index a8824a9fe6..5ad686f192 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -704,7 +704,6 @@ nm_netlink_get_default_handle (void) self = nm_netlink_monitor_get (); nlh = NM_NETLINK_MONITOR_GET_PRIVATE (self)->nlh_sync; - g_object_unref (self); return nlh; } @@ -723,7 +722,6 @@ nm_netlink_iface_to_index (const char *iface) nl_cache_refill (priv->nlh_sync, priv->link_cache); idx = rtnl_link_name2i (priv->link_cache, iface); - g_object_unref (self); return idx; } @@ -758,7 +756,6 @@ nm_netlink_index_to_iface (int idx) buf = NULL; } - g_object_unref (self); return buf; } @@ -777,7 +774,6 @@ nm_netlink_index_to_rtnl_link (int idx) nl_cache_refill (priv->nlh_sync, priv->link_cache); ret = rtnl_link_get (priv->link_cache, idx); - g_object_unref (self); return ret; } @@ -807,8 +803,7 @@ nm_netlink_monitor_get (void) g_object_unref (singleton); singleton = NULL; } - } else - g_object_ref (singleton); + } return singleton; } |