NetworkManager r3707 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu May 29 20:35:34 2008
New Revision: 3707
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3707&view=rev

Log:
2008-05-29  Dan Williams <dcbw redhat com>

	* src/nm-device-private.h
		- Remove unused prototypes and clean up

	* src/nm-device.c
		- Remove anything related to system_config_data, which is no longer used
		- (nm_device_new_ip4_autoip_config): make static



Modified:
   trunk/ChangeLog
   trunk/src/nm-device-private.h
   trunk/src/nm-device.c

Modified: trunk/src/nm-device-private.h
==============================================================================
--- trunk/src/nm-device-private.h	(original)
+++ trunk/src/nm-device-private.h	Thu May 29 20:35:34 2008
@@ -24,14 +24,13 @@
 
 #include "nm-device.h"
 
-void			nm_device_set_ip_iface (NMDevice *self, const char *iface);
-void			nm_device_set_device_type (NMDevice *dev, NMDeviceType type);
-void			nm_device_set_active_link	(NMDevice *dev, const gboolean active);
-NMIP4Config *	nm_device_new_ip4_autoip_config (NMDevice *self);
+void nm_device_set_ip_iface (NMDevice *self, const char *iface);
 
-void			nm_device_activate_schedule_stage3_ip_config_start (NMDevice *device);
+void nm_device_set_device_type (NMDevice *dev, NMDeviceType type);
 
-void			nm_device_state_changed (NMDevice *device, NMDeviceState state);
+void nm_device_activate_schedule_stage3_ip_config_start (NMDevice *device);
+
+void nm_device_state_changed (NMDevice *device, NMDeviceState state);
 
 gboolean nm_device_hw_bring_up (NMDevice *self, gboolean wait);
 

Modified: trunk/src/nm-device.c
==============================================================================
--- trunk/src/nm-device.c	(original)
+++ trunk/src/nm-device.c	Thu May 29 20:35:34 2008
@@ -82,7 +82,6 @@
 	gulong          secrets_failed_id;
 
 	/* IP configuration info */
-	void *			system_config_data;	/* Distro-specific config data (parsed config file, etc) */
 	NMIP4Config *		ip4_config;			/* Config from DHCP, PPP, or system config files */
 	NMDHCPManager *     dhcp_manager;
 	gulong              dhcp_state_sigid;
@@ -130,7 +129,6 @@
 
 	self->priv->act_source_id = 0;
 
-	self->priv->system_config_data = NULL;
 	self->priv->ip4_config = NULL;
 
 	self->priv->state = NM_DEVICE_STATE_UNMANAGED;
@@ -615,7 +613,7 @@
  * Build up an IP config with a Link Local address
  *
  */
-NMIP4Config *
+static NMIP4Config *
 nm_device_new_ip4_autoip_config (NMDevice *self)
 {
 	struct in_addr ip;
@@ -1485,21 +1483,6 @@
 	nm_device_hw_take_down (self, wait);
 }
 
-/*
- * nm_device_get_system_config_data
- *
- * Return distro-specific system configuration data for this device.
- *
- */
-void *
-nm_device_get_system_config_data (NMDevice *self)
-{
-	g_return_val_if_fail (self != NULL, NULL);
-
-	return self->priv->system_config_data;
-}
-
-
 static void
 nm_device_dispose (GObject *object)
 {