projects
/
NetworkManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6673d3a
)
dns: cleanup disposing of NMDnsPlugin
author
Thomas Haller
<thaller@redhat.com>
Tue, 22 Mar 2016 15:08:07 +0000
(16:08 +0100)
committer
Thomas Haller
<thaller@redhat.com>
Tue, 22 Mar 2016 15:45:00 +0000
(16:45 +0100)
src/dns-manager/nm-dns-plugin.c
patch
|
blob
|
history
diff --git
a/src/dns-manager/nm-dns-plugin.c
b/src/dns-manager/nm-dns-plugin.c
index
991f132
..
57e24e6
100644
(file)
--- 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);
}