2004-10-14 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c - Only accept and manager 802.3 and 802.11 devices * src/NetworkManagerDbus.[ch] - (nm_dbus_nm_set_active_device): move most of the actual activation logic into NetworkManagerDevice.c - (nm_dbus_network_status_from_data): new function - (nm_dbus_signal_network_status_change): new function, unused for now - (nm_dbus_nm_message_handler): use nm_dbus_network_status_from_data () now * src/NetworkManagerDevice.[ch] - (nm_device_find_and_use_essid): new function. Search for, and if found use, a random ESSID. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@231 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -64,9 +64,18 @@ static char *nm_get_device_interface_from_hal (LibHalContext *ctx, const char *u
|
||||
|
||||
if (hal_device_property_exists (ctx, udi, "net.interface"))
|
||||
{
|
||||
char *temp = hal_device_get_property_string (ctx, udi, "net.interface");
|
||||
iface = g_strdup (temp);
|
||||
hal_free_string (temp);
|
||||
/* Only use Ethernet and Wireless devices for now (ie not Sharp Zaurus IP-over-USB connections) */
|
||||
if (hal_device_property_exists (ctx, udi, "info.category"))
|
||||
{
|
||||
char *category = hal_device_get_property_string (ctx, udi, "info.category");
|
||||
if (category && (!strcmp (category, "net.80203") || !strcmp (category, "net.80211")))
|
||||
{
|
||||
char *temp = hal_device_get_property_string (ctx, udi, "net.interface");
|
||||
iface = g_strdup (temp);
|
||||
hal_free_string (temp);
|
||||
}
|
||||
hal_free_string (category);
|
||||
}
|
||||
}
|
||||
|
||||
return (iface);
|
||||
|
Reference in New Issue
Block a user