From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 1 Mar 2016 16:55:22 +0100
Subject: Imported Upstream version 1.1.91

---
 src/dns-manager/nm-dns-plugin.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dns-manager/nm-dns-plugin.c')

diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
index a8236696..8313ed13 100644
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -17,7 +17,7 @@
  *
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "nm-default.h"
 #include "nm-dns-plugin.h"
 #include "NetworkManagerUtils.h"
 
@@ -33,7 +32,7 @@ typedef struct {
 	gboolean disposed;
 
 	GPid pid;
-	guint32 watch_id;
+	guint watch_id;
 	char *progname;
 	char *pidfile;
 } NMDnsPluginPrivate;
@@ -130,6 +129,7 @@ watch_cb (GPid pid, gint status, gpointer user_data)
 	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
 
 	priv->pid = 0;
+	priv->watch_id = 0;
 	g_free (priv->progname);
 	priv->progname = NULL;
 
-- 
cgit 1.3.0-6-gf8a5