2005-12-06 Dan Williams <dcbw@redhat.com>

* Change naming of NMDeviceType to something more sensible:
		NM_DEVICE_TYPE_DONT_KNOW -> NM_DEVICE_TYPE_UNKNOWN
		NM_DEVICE_TYPE_WIRED_ETHERNET -> NM_DEVICE_TYPE_802_3_ETHERNET
		NM_DEVICE_TYPE_WIRELESS_ETHERNET -> NM_DEVICE_TYPE_802_11_WIRELESS


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1131 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

@@ -1,3 +1,10 @@
+2005-12-06  Dan Williams  <dcbw@redhat.com>
+
+	* Change naming of NMDeviceType to something more sensible:
+		NM_DEVICE_TYPE_DONT_KNOW -> NM_DEVICE_TYPE_UNKNOWN
+		NM_DEVICE_TYPE_WIRED_ETHERNET -> NM_DEVICE_TYPE_802_3_ETHERNET
+		NM_DEVICE_TYPE_WIRELESS_ETHERNET -> NM_DEVICE_TYPE_802_11_WIRELESS
+
 2005-12-06  Dan Williams  <dcbw@redhat.com>
 
 	* Move NetworkManager.h -> include/NetworkManager.h

gnome/applet/applet-dbus-devices.c

@@ -740,7 +740,7 @@ static void nmwa_dbus_device_properties_cb (DBusPendingCall *pcall, void *user_d
 
 		nmwa_dbus_update_device_info_from_hal (dev, applet);
 
-		if (type == DEVICE_TYPE_WIRELESS_ETHERNET)
+		if (type == DEVICE_TYPE_802_11_WIRELESS)
 		{
 			network_device_set_strength (dev, strength);
 

gnome/applet/applet.c

@@ -1475,7 +1475,7 @@ static void nmwa_menu_add_device_item (GtkWidget *menu, NetworkDevice *device, g
 
 	switch (network_device_get_type (device))
 	{
-		case DEVICE_TYPE_WIRED_ETHERNET:
+		case DEVICE_TYPE_802_3_ETHERNET:
 		{
 			NMWiredMenuItem *item = wired_menu_item_new ();
 			GtkCheckMenuItem *gtk_item = wired_menu_item_get_check_item (item);
@@ -1494,7 +1494,7 @@ static void nmwa_menu_add_device_item (GtkWidget *menu, NetworkDevice *device, g
 			break;
 		}
 
-		case DEVICE_TYPE_WIRELESS_ETHERNET:
+		case DEVICE_TYPE_802_11_WIRELESS:
 		{
 			NMWirelessMenuItem *item;
 			GtkMenuItem *gtk_item;
@@ -1801,10 +1801,10 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
 
 		switch (network_device_get_type (dev))
 		{
-			case DEVICE_TYPE_WIRELESS_ETHERNET:
+			case DEVICE_TYPE_802_11_WIRELESS:
 				n_wireless_interfaces++;
 				break;
-			case DEVICE_TYPE_WIRED_ETHERNET:
+			case DEVICE_TYPE_802_3_ETHERNET:
 				n_wired_interfaces++;
 				break;
 			default:
@@ -1827,11 +1827,11 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
 
 			switch (network_device_get_type (dev))
 			{
-				case DEVICE_TYPE_WIRED_ETHERNET:
+				case DEVICE_TYPE_802_3_ETHERNET:
 					n_devices = n_wired_interfaces;
 					break;
 
-				case DEVICE_TYPE_WIRELESS_ETHERNET:
+				case DEVICE_TYPE_802_11_WIRELESS:
 					n_devices = n_wireless_interfaces;
 					break;
 
@@ -2041,7 +2041,7 @@ static void nmwa_context_menu_update (NMWirelessApplet *applet)
 
 		g_assert (dev);
 
-		if (network_device_get_type (dev) == DEVICE_TYPE_WIRELESS_ETHERNET)
+		if (network_device_get_type (dev) == DEVICE_TYPE_802_11_WIRELESS)
 		{
 			have_wireless = TRUE;
 			break;

gnome/applet/nm-device.c

@@ -148,7 +148,7 @@ void network_device_unref (NetworkDevice *dev)
 	dev->refcount--;
 	if (dev->refcount < 1)
 	{
-		if (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET)
+		if (dev->type == DEVICE_TYPE_802_11_WIRELESS)
 			network_device_clear_wireless_networks (dev);
 		g_free (dev->nm_path);
 		g_free (dev->iface);
@@ -169,7 +169,7 @@ gboolean network_device_is_wired (NetworkDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, FALSE);
 
-	return (network_device_get_type (dev) == DEVICE_TYPE_WIRED_ETHERNET);
+	return (network_device_get_type (dev) == DEVICE_TYPE_802_3_ETHERNET);
 }
 
 
@@ -177,7 +177,7 @@ gboolean network_device_is_wireless (NetworkDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, FALSE);
 
-	return (network_device_get_type (dev) == DEVICE_TYPE_WIRELESS_ETHERNET);
+	return (network_device_get_type (dev) == DEVICE_TYPE_802_11_WIRELESS);
 }
 
 
@@ -193,7 +193,7 @@ WirelessNetwork *network_device_get_active_wireless_network (NetworkDevice *dev)
 	WirelessNetwork *	active = NULL;
 
 	g_return_val_if_fail (dev != NULL, NULL);
-	g_return_val_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET, NULL);
+	g_return_val_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS, NULL);
 
 	for (list = dev->networks; list; list = list->next)
 	{
@@ -222,7 +222,7 @@ WirelessNetwork *network_device_get_wireless_network_by_essid (NetworkDevice *de
 	WirelessNetwork *	return_net = NULL;
 
 	g_return_val_if_fail (dev != NULL, NULL);
-	g_return_val_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET, NULL);
+	g_return_val_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS, NULL);
 	g_return_val_if_fail (essid != NULL, NULL);
 
 	for (list = dev->networks; list; list = list->next)
@@ -252,7 +252,7 @@ WirelessNetwork *network_device_get_wireless_network_by_nm_path (NetworkDevice *
 	WirelessNetwork *	return_net = NULL;
 
 	g_return_val_if_fail (dev != NULL, NULL);
-	g_return_val_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET, NULL);
+	g_return_val_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS, NULL);
 	g_return_val_if_fail (nm_path != NULL, NULL);
 
 	for (list = dev->networks; list; list = list->next)
@@ -281,7 +281,7 @@ void network_device_foreach_wireless_network (NetworkDevice *dev, WirelessNetwor
 	GSList *			list;
 
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 	g_return_if_fail (func != NULL);
 
 	for (list = dev->networks; list; list = list->next)
@@ -303,7 +303,7 @@ void network_device_foreach_wireless_network (NetworkDevice *dev, WirelessNetwor
 void network_device_add_wireless_network (NetworkDevice *dev, WirelessNetwork *net)
 {
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 	g_return_if_fail (net != NULL);
 
 	wireless_network_ref (net);
@@ -318,7 +318,7 @@ void network_device_add_wireless_network (NetworkDevice *dev, WirelessNetwork *n
 void network_device_clear_wireless_networks (NetworkDevice *dev)
 {
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 
 	g_slist_foreach (dev->networks, (GFunc) wireless_network_unref, NULL);
 	g_slist_free (dev->networks);
@@ -337,7 +337,7 @@ void network_device_remove_wireless_network (NetworkDevice *dev, WirelessNetwork
 	GSList	*elt;
 
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 	g_return_if_fail (net != NULL);
 
 	for (elt = dev->networks; elt; elt = g_slist_next (elt))
@@ -378,7 +378,7 @@ static int sort_networks_function (WirelessNetwork *a, WirelessNetwork *b)
 void network_device_sort_wireless_networks (NetworkDevice *dev)
 {
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 
 	dev->networks = g_slist_sort (dev->networks, (GCompareFunc) sort_networks_function);
 }
@@ -393,7 +393,7 @@ void network_device_sort_wireless_networks (NetworkDevice *dev)
 guint network_device_get_num_wireless_networks (NetworkDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, 0);
-	g_return_val_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET, 0);
+	g_return_val_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS, 0);
 	
 	return g_slist_length (dev->networks);
 }
@@ -564,7 +564,7 @@ const char *network_device_get_nm_path (NetworkDevice *dev)
  */
 NMDeviceType network_device_get_type (NetworkDevice *dev)
 {
-	g_return_val_if_fail (dev != NULL, DEVICE_TYPE_DONT_KNOW);
+	g_return_val_if_fail (dev != NULL, DEVICE_TYPE_UNKNOWN);
 
 	return (dev->type);
 }
@@ -575,7 +575,7 @@ NMDeviceType network_device_get_type (NetworkDevice *dev)
 gint network_device_get_strength (NetworkDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, -1);
-	g_return_val_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET, -1);
+	g_return_val_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS, -1);
 
 	return (dev->strength);
 }
@@ -583,7 +583,7 @@ gint network_device_get_strength (NetworkDevice *dev)
 void network_device_set_strength (NetworkDevice *dev, gint strength)
 {
 	g_return_if_fail (dev != NULL);
-	g_return_if_fail (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	g_return_if_fail (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 
 	dev->strength = strength;
 }

include/NetworkManager.h

@@ -73,9 +73,9 @@ typedef enum NMState
  */
 typedef enum NMDeviceType
 {
-	DEVICE_TYPE_DONT_KNOW = 0,
+	DEVICE_TYPE_UNKNOWN = 0,
-	DEVICE_TYPE_WIRED_ETHERNET,
+	DEVICE_TYPE_802_3_ETHERNET,
-	DEVICE_TYPE_WIRELESS_ETHERNET
+	DEVICE_TYPE_802_11_WIRELESS
 } NMDeviceType;
 
 

src/NetworkManager.c

@@ -235,7 +235,7 @@ static void nm_hal_device_added (LibHalContext *ctx, const char *udi)
 	 */
 	if ((iface = nm_get_device_interface_from_hal (data->hal_ctx, udi)))
 	{
-		nm_create_device_and_add_to_list (data, udi, iface, FALSE, DEVICE_TYPE_DONT_KNOW);
+		nm_create_device_and_add_to_list (data, udi, iface, FALSE, DEVICE_TYPE_UNKNOWN);
 		g_free (iface);
 	}
 }
@@ -285,7 +285,7 @@ static void nm_hal_device_new_capability (LibHalContext *ctx, const char *udi, c
 
 		if ((iface = nm_get_device_interface_from_hal (data->hal_ctx, udi)))
 		{
-			nm_create_device_and_add_to_list (data, udi, iface, FALSE, DEVICE_TYPE_DONT_KNOW);
+			nm_create_device_and_add_to_list (data, udi, iface, FALSE, DEVICE_TYPE_UNKNOWN);
 			g_free (iface);
 		}
 	}
@@ -324,7 +324,7 @@ void nm_add_initial_devices (NMData *data)
 
 			if ((iface = nm_get_device_interface_from_hal (data->hal_ctx, net_devices[i])))
 			{
-				nm_create_device_and_add_to_list (data, net_devices[i], iface, FALSE, DEVICE_TYPE_DONT_KNOW);
+				nm_create_device_and_add_to_list (data, net_devices[i], iface, FALSE, DEVICE_TYPE_UNKNOWN);
 				g_free (iface);
 			}
 		}

src/NetworkManagerDevice.c

@@ -391,7 +391,7 @@ static gboolean nm_device_wireless_init (NMDevice *dev)
  * nm_device_new
  *
  * Creates and initializes the structure representation of an NM device.  For test
- * devices, a device type other than DEVICE_TYPE_DONT_KNOW must be specified, this
+ * devices, a device type other than DEVICE_TYPE_UNKNWON must be specified, this
  * argument is ignored for real hardware devices since they are auto-probed.
  *
  */
@@ -406,7 +406,7 @@ NMDevice *nm_device_new (const char *iface, const char *udi, gboolean test_dev,
 	g_return_val_if_fail (app_data != NULL, NULL);
 
 	/* Test devices must have a valid type specified */
-	if (test_dev && !(test_dev_type != DEVICE_TYPE_DONT_KNOW))
+	if (test_dev && !(test_dev_type != DEVICE_TYPE_UNKNOWN))
 		return (NULL);
 
 	/* Another check to make sure we don't create a test device unless
@@ -436,7 +436,7 @@ NMDevice *nm_device_new (const char *iface, const char *udi, gboolean test_dev,
 		dev->type = test_dev_type;
 	else
 		dev->type = nm_device_test_wireless_extensions (dev) ?
-						DEVICE_TYPE_WIRELESS_ETHERNET : DEVICE_TYPE_WIRED_ETHERNET;
+						DEVICE_TYPE_802_11_WIRELESS : DEVICE_TYPE_802_3_ETHERNET;
 
 	/* Device thread's main loop */
 	dev->context = g_main_context_new ();
@@ -822,7 +822,7 @@ const char * nm_device_get_driver (NMDevice *dev)
  */
 guint nm_device_get_type (NMDevice *dev)
 {
-	g_return_val_if_fail (dev != NULL, DEVICE_TYPE_DONT_KNOW);
+	g_return_val_if_fail (dev != NULL, DEVICE_TYPE_UNKNOWN);
 
 	return (dev->type);
 }
@@ -831,14 +831,14 @@ gboolean nm_device_is_wireless (NMDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, FALSE);
 
-	return (dev->type == DEVICE_TYPE_WIRELESS_ETHERNET);
+	return (dev->type == DEVICE_TYPE_802_11_WIRELESS);
 }
 
 gboolean nm_device_is_wired (NMDevice *dev)
 {
 	g_return_val_if_fail (dev != NULL, FALSE);
 
-	return (dev->type == DEVICE_TYPE_WIRED_ETHERNET);
+	return (dev->type == DEVICE_TYPE_802_3_ETHERNET);
 }
 
 

src/nm-dbus-nm.c

@@ -327,7 +327,7 @@ static DBusMessage *nm_dbus_nm_create_test_device (DBusConnection *connection, D
 
 	dbus_error_init (&err);
 	if (    dbus_message_get_args (message, &err, DBUS_TYPE_INT32, &type, DBUS_TYPE_INVALID)
-		&& ((type == DEVICE_TYPE_WIRED_ETHERNET) || (type == DEVICE_TYPE_WIRELESS_ETHERNET)))
+		&& ((type == DEVICE_TYPE_802_3_ETHERNET) || (type == DEVICE_TYPE_802_11_WIRELESS)))
 	{
 		char			*interface = g_strdup_printf ("test%d", test_dev_num);
 		char			*udi = g_strdup_printf ("/test-devices/%s", interface);

test/nm-tool.c

@@ -234,9 +234,9 @@ static void detail_device (DBusConnection *connection, const char *path)
 
 		/* General information */
 		print_string ("NM Path", op);
-		if (type == DEVICE_TYPE_WIRELESS_ETHERNET)
+		if (type == DEVICE_TYPE_802_11_WIRELESS)
 			print_string ("Type", "802.11 Wireless");
-		else if (type == DEVICE_TYPE_WIRED_ETHERNET)
+		else if (type == DEVICE_TYPE_802_3_ETHERNET)
 			print_string ("Type", "Wired");
 		if (active)
 			print_string ("Active", "yes");
@@ -257,7 +257,7 @@ static void detail_device (DBusConnection *connection, const char *path)
 			print_string ("  Scanning", "yes");
 
 		/* Wireless specific information */
-		if (type == DEVICE_TYPE_WIRELESS_ETHERNET)
+		if (type == DEVICE_TYPE_802_11_WIRELESS)
 		{
 			char *str_strength;
 			int	 i;
@@ -277,7 +277,7 @@ static void detail_device (DBusConnection *connection, const char *path)
 			for (i = 0; i < num_networks; i++)
 				detail_network (connection, networks[i], active_network_path);
 		}
-		else if (type == DEVICE_TYPE_WIRED_ETHERNET)
+		else if (type == DEVICE_TYPE_802_3_ETHERNET)
 		{
 			fprintf (stdout, "\n  Wired Settings\n");
 			if (link_active)

test/nmtestdevices.c

@@ -38,7 +38,7 @@ static void create_device (DBusConnection *connection, NMDeviceType type)
 	char *string;
 
 	g_return_if_fail (connection != NULL);
-	g_return_if_fail (((type == DEVICE_TYPE_WIRED_ETHERNET) || (type == DEVICE_TYPE_WIRELESS_ETHERNET)));
+	g_return_if_fail (((type == DEVICE_TYPE_802_3_ETHERNET) || (type == DEVICE_TYPE_802_11_WIRELESS)));
 
 	message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "createTestDevice");
 	if (message == NULL)
@@ -189,7 +189,7 @@ int main( int argc, char *argv[] )
 	gboolean		 remove = FALSE;
 	gboolean		 make_link_active = FALSE;
 	gboolean		 make_link_inactive = FALSE;
-	NMDeviceType	 dev_type = DEVICE_TYPE_DONT_KNOW;
+	NMDeviceType	 dev_type = DEVICE_TYPE_UNKNOWN;
 
 	if (argc < 2) {
 		print_usage ();
@@ -231,9 +231,9 @@ int main( int argc, char *argv[] )
 					if (optarg)
 					{
 						if (strcmp (optarg, "wired") == 0)
-							dev_type = DEVICE_TYPE_WIRED_ETHERNET;
+							dev_type = DEVICE_TYPE_802_3_ETHERNET;
 						else if (strcmp (optarg, "wireless") == 0)
-							dev_type = DEVICE_TYPE_WIRELESS_ETHERNET;
+							dev_type = DEVICE_TYPE_802_11_WIRELESS;
 					}
 				}
 				else if (strcmp (opt, "remove-device") == 0)