colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-03-07 Ray Strode <rstrode@redhat.com>

Browse Source 
* info-daemon/NetworkManagerInfoDbus.c:
	* libnm_glib/libnm_glib.c:
	* panel-applet/NMWirelessAppletDbus.c:
	* src/NetworkManager.c:
	* src/NetworkManagerDbus.c:
	* src/NetworkManagerDevice.c:
	* src/NetworkManagerUtils.c:
	* src/nm-dbus-device.c:
	* src/nm-dbus-dhcp.c:
	* src/nm-dbus-net.c:
	* src/nm-dbus-nm.c:
	* test/nminfotest.c:
	First (unfinished, unworking) cut at porting to dbus 0.30 api.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@493 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Ray Strode
2005-03-08 03:44:27 +00:00
parent bd14854d2d
commit a5d937a62e
13 changed files with 752 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/NetworkManagerUtils.c
View File

@@ -292,9 +292,9 @@ char *nm_get_device_driver_name (LibHalContext *ctx, NMDevice *dev)
g_return_val_if_fail (dev != NULL, NULL);
if ( (udi = nm_device_get_udi (dev))
&& hal_device_property_exists (ctx, udi, "net.linux.driver"))
&& libhal_device_property_exists (ctx, udi, "net.linux.driver", NULL))
{
driver_name = hal_device_get_property_string (ctx, udi, "net.linux.driver");
driver_name = libhal_device_get_property_string (ctx, udi, "net.linux.driver", NULL);
}
return (driver_name);
@@ -374,10 +374,10 @@ NMDriverSupportLevel nm_get_wired_driver_support_level (LibHalContext *ctx, NMDe
/* Ignore Ethernet-over-USB devices too for the moment (Red Hat #135722) */
udi = nm_device_get_udi (dev);
if ( hal_device_property_exists (ctx, udi, "usb.interface.class")
&& (usb_test = hal_device_get_property_string (ctx, udi, "usb.interface.class")))
if ( libhal_device_property_exists (ctx, udi, "usb.interface.class", NULL)
&& (usb_test = libhal_device_get_property_string (ctx, udi, "usb.interface.class", NULL)))
{
hal_free_string (usb_test);
libhal_free_string (usb_test);
level = NM_DRIVER_UNSUPPORTED;
}