From 040759fdbd798a384979cf860fcc3b6288554370 Mon Sep 17 00:00:00 2001
From: Tambet Ingo <tambet@gmail.com>
Date: Fri, 14 Mar 2008 22:54:15 +0000
Subject: [PATCH] Squashed commit of the following:

commit 5979484d01a27a37d2b221cf357e5c77dce4ff3d
Author: Tambet Ingo <tambet@gmail.com>
Date:   Fri Mar 14 16:53:43 2008 -0600

    2008-03-14  Tambet Ingo  <tambet@gmail.com>

    	* src/backends/NetworkManagerSlackware.c
    	(nm_system_device_setup_static_ip4_config): Remove, it's unused.

    	* src/backends/NetworkManagerSuSE.c: Add missing includes.

commit de4e1e57541f62e610d5b622f2d38f5c84848daa
Author: Tambet Ingo <tambet@gmail.com>
Date:   Fri Mar 14 16:38:48 2008 -0600

    2008-03-14  Tambet Ingo  <tambet@gmail.com>

    	* libnm-util/Makefile.am: Add new files to build.

    	* libnm-util/nm-connection.c: Register NMSetting8021x.

    	* libnm-util/nm-setting-8021x.c
    	* libnm-util/nm-setting-8021x.h: Implement.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3467 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 ChangeLog                              | 16 ++++++++++++++++
 src/backends/NetworkManagerSlackware.c | 15 ---------------
 src/backends/NetworkManagerSuSE.c      |  3 +++
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb603270a5..38cbb2ff0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-14  Tambet Ingo  <tambet@gmail.com>
+
+	* src/backends/NetworkManagerSlackware.c 
+	(nm_system_device_setup_static_ip4_config): Remove, it's unused.
+
+	* src/backends/NetworkManagerSuSE.c: Add missing includes.
+
 2008-03-14  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-manager.c
@@ -14,6 +21,15 @@
 	* libnm-util/nm-setting-8021x.c
 	* libnm-util/nm-setting-8021x.h: Implement.
 
+2008-03-14  Tambet Ingo  <tambet@gmail.com>
+
+	* libnm-util/Makefile.am: Add new files to build.
+
+	* libnm-util/nm-connection.c: Register NMSetting8021x.
+
+	* libnm-util/nm-setting-8021x.c
+	* libnm-util/nm-setting-8021x.h: Implement.
+
 2008-03-14  Tambet Ingo  <tambet@gmail.com>
 
 	* src/NetworkManagerPolicy.c (auto_activate_device): Don't leak device and
diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c
index d458579159..beeb1e06fd 100644
--- a/src/backends/NetworkManagerSlackware.c
+++ b/src/backends/NetworkManagerSlackware.c
@@ -98,21 +98,6 @@ void nm_system_device_flush_addresses_with_iface (const char *iface)
 	nm_generic_device_flush_addresses_with_iface (iface);
 }
 
-/*
- * nm_system_device_setup_static_ip4_config
- *
- * Set up the device with a particular IPv4 address/netmask/gateway.
- *
- * Returns:	TRUE	on success
- *			FALSE on error
- *
- */
-gboolean nm_system_device_setup_static_ip4_config (NMDevice *dev)
-{
-	nm_warning ("nm_system_device_setup_static_ip4_config() is not implemented yet for this distribution.\n");
-	return FALSE;
-}
-
 /*
  * nm_system_device_get_system_config
  *
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index 3cd906965c..1ae0bbf1ab 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -34,6 +34,9 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <errno.h>
 
 #include "NetworkManagerGeneric.h"
 #include "NetworkManagerSystem.h"