[Pkg-utopia-commits] r2160 - in /packages/unstable/networkmanager/debian: changelog patches/08-hal_deprecated_keys.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr  3 01:29:36 2008
New Revision: 2160

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2160
Log:
debian/patches/08-hal_deprecated_keys.patch
- Add support for the "net.originating_device" key, which has replaced
the deprecated "net.physical_device" key in newer HAL versions.

Added:
    packages/unstable/networkmanager/debian/patches/08-hal_deprecated_keys.patch
Modified:
    packages/unstable/networkmanager/debian/changelog

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=2160&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Apr  3 01:29:36 2008
@@ -18,6 +18,9 @@
   * debian/patches/07-domain_search.patch
     - Add support for DHCP domain-search option. (Closes: #465158)
       Thanks to Bas Zoetekouw for the patch.
+  * debian/patches/08-hal_deprecated_keys.patch
+    - Add support for the "net.originating_device" key, which has replaced
+      the deprecated "net.physical_device" key in newer HAL versions.
   * debian/patches/06-dispatch_more_events.patch
     - NetworkManagerDispatcher.1.in has been renamed to
       NetworkManagerDispatcher.8.in. Update the patch accordingly.

Added: packages/unstable/networkmanager/debian/patches/08-hal_deprecated_keys.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/08-hal_deprecated_keys.patch?rev=2160&op=file
==============================================================================
--- packages/unstable/networkmanager/debian/patches/08-hal_deprecated_keys.patch (added)
+++ packages/unstable/networkmanager/debian/patches/08-hal_deprecated_keys.patch Thu Apr  3 01:29:36 2008
@@ -1,0 +1,34 @@
+Index: src/nm-device.c
+===================================================================
+--- src/nm-device.c	(Revision 3527)
++++ src/nm-device.c	(Arbeitskopie)
+@@ -115,19 +115,24 @@
+ nm_get_device_driver_name (LibHalContext *ctx, const char *udi)
+ {
+ 	char	*	driver_name = NULL;
+-	char *	physdev_udi = NULL;
++	char *	origdev_udi = NULL;
+ 
+ 	g_return_val_if_fail (ctx != NULL, NULL);
+ 	g_return_val_if_fail (udi != NULL, NULL);
+ 
+-	physdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL);
+-	if (physdev_udi && libhal_device_property_exists (ctx, physdev_udi, "info.linux.driver", NULL))
++	origdev_udi = libhal_device_get_property_string (ctx, udi, "net.originating_device", NULL);
++	if (!origdev_udi) {
++		/* Older HAL uses 'physical_device' */
++		origdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL);
++	}
++
++	if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL))
+ 	{
+-		char *drv = libhal_device_get_property_string (ctx, physdev_udi, "info.linux.driver", NULL);
++		char *drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL);
+ 		driver_name = g_strdup (drv);
+ 		g_free (drv);
+ 	}
+-	g_free (physdev_udi);
++	g_free (origdev_udi);
+ 
+ 	return driver_name;
+ }