summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-03-22 16:08:07 +0100
committerThomas Haller <thaller@redhat.com>2016-03-22 16:45:00 +0100
commitca733526e6a5f08c98b23fe2c273d9ded77efd59 (patch)
tree7626e70259404abd46fcd163b35bbfea8d170b2f
parent6673d3ad7a6690725029af16e62afec1461176a4 (diff)
downloadNetworkManager-ca733526e6a5f08c98b23fe2c273d9ded77efd59.tar.gz
dns: cleanup disposing of NMDnsPlugin
-rw-r--r--src/dns-manager/nm-dns-plugin.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
index 991f132dcd..57e24e6035 100644
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -29,8 +29,6 @@
#include "NetworkManagerUtils.h"
typedef struct {
- gboolean disposed;
-
GPid pid;
guint watch_id;
char *progname;
@@ -227,13 +225,8 @@ static void
dispose (GObject *object)
{
NMDnsPlugin *self = NM_DNS_PLUGIN (object);
- NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
- if (!priv->disposed) {
- priv->disposed = TRUE;
-
- nm_dns_plugin_child_kill (self);
- }
+ nm_dns_plugin_child_kill (self);
G_OBJECT_CLASS (nm_dns_plugin_parent_class)->dispose (object);
}