diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-08-20 04:57:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-08-20 04:57:23 +0800 |
| commit | 651c7095bf6fefec842661f0fb50b027f8719b98 (patch) | |
| tree | ce9bd89dce8adce30a13572545927a3972b84d15 /sysutils/hal | |
| parent | 70f45e48b74d654a332edb491a31aba0186e6a7f (diff) | |
| download | marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar.gz marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar.bz2 marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar.lz marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar.xz marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.tar.zst marcuscom-ports-651c7095bf6fefec842661f0fb50b027f8719b98.zip | |
Fix some DBusError handling, and a memory leak.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12664 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/hal')
| -rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index fb308eefd..18b6ce415 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.60 2009/08/08 20:02:21 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.61 2009/08/19 04:40:26 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c index 4a0531f35..0544344c7 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c @@ -1,5 +1,5 @@ --- hald/freebsd/probing/probe-volume.c.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/probing/probe-volume.c 2009-07-18 21:20:55.000000000 -0400 ++++ hald/freebsd/probing/probe-volume.c 2009-08-19 16:54:15.000000000 -0400 @@ -36,7 +36,12 @@ #include <sys/disk.h> #include <sys/cdio.h> @@ -23,7 +23,7 @@ hf_probe_volume_advanced_disc_detect(fd); } else -@@ -555,6 +561,40 @@ main (int argc, char **argv) +@@ -555,6 +561,45 @@ main (int argc, char **argv) libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error); @@ -53,10 +53,15 @@ + gboolean mounted; + + mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error); ++ dbus_error_free(&hfp_error); + if (mounted) -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); ++ { ++ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); ++ dbus_error_free(&hfp_error); ++ } + } + } ++ libhal_free_string_array(ufs_devs); + ufs_disk_close(&ufsdisk); + } + } |