summary refs log tree commit diff
path: root/libnm-glib/nm-vpn-plugin.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-01 16:55:22 +0100
committerMichael Biebl <biebl@debian.org>2016-03-01 16:55:22 +0100
commitc2de0d98ba39e0a1a970d066fd19be786092f376 (patch)
tree3838363c06a6019db6cf1f882ea34ebded63c38b /libnm-glib/nm-vpn-plugin.c
parent494f296a3baab08522617b24b1f126d8f9a17502 (diff)
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'libnm-glib/nm-vpn-plugin.c')
-rw-r--r--libnm-glib/nm-vpn-plugin.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index d180ec44..67ddd83b 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -19,16 +19,16 @@
  * Copyright 2007 - 2008 Red Hat, Inc.
  */
 
-#include "config.h"
-
-#include <signal.h>
 #include "nm-default.h"
+
 #include "nm-vpn-plugin.h"
+
+#include <signal.h>
+
 #include "nm-vpn-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-macros-internal.h"
 
 static gboolean impl_vpn_plugin_connect    (NMVPNPlugin *plugin,
                                             GHashTable *connection,
@@ -342,8 +342,6 @@ nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
 	if (val && g_value_get_boolean (val))
 		priv->has_ip6 = TRUE;
 
-	g_warn_if_fail (priv->has_ip4 || priv->has_ip6);
-
 	/* Record the items that need to also be inserted into the
 	 * ip4config, for compatibility with older daemons.
 	 */