diff options
| author | marcus <marcus@FreeBSD.org> | 2008-01-06 12:27:00 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2008-01-06 12:27:00 +0800 |
| commit | 982ab277f0644bd3b06b69883859b3144f86fb83 (patch) | |
| tree | f03a3c150cd98fd684ecd4e431ccd5b610600a4f /sysutils | |
| parent | 3dc9db1a117653f8220dbe2542af0b80f0a21e26 (diff) | |
| download | freebsd-ports-gnome-982ab277f0644bd3b06b69883859b3144f86fb83.tar.gz freebsd-ports-gnome-982ab277f0644bd3b06b69883859b3144f86fb83.tar.zst freebsd-ports-gnome-982ab277f0644bd3b06b69883859b3144f86fb83.zip | |
Fix a warning seen trying to restore the previous used drive setting.
Reported by: mezz
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c | 34 |
2 files changed, 23 insertions, 12 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 2f5a1903d595..9900ba6a5edf 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 2.20.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c index 702788216269..58743c0fe275 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c @@ -1,6 +1,16 @@ ---- src/nautilus-burn-drive-monitor.c.orig Fri Sep 29 14:18:23 2006 -+++ src/nautilus-burn-drive-monitor.c Sun Nov 19 13:28:16 2006 -@@ -683,6 +683,8 @@ hal_drive_from_udi (LibHalContext *ctx, +--- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 ++++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 +@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo + */ + if (drive->priv->device != NULL && + (strcmp (drive->priv->device, target) == 0 || +- strcmp (drive->priv->device, device) == 0)) { ++ strcmp (drive->priv->device, device) == 0 || ++ strcmp (drive->priv->cdrecord_device, device) == 0)) { + ret = nautilus_burn_drive_ref (drive); + break; + } +@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx, NautilusBurnDrive *drive; char **write_speeds = NULL; char *raw_device = NULL; @@ -9,21 +19,19 @@ LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); -@@ -711,6 +713,8 @@ hal_drive_from_udi (LibHalContext *ctx, +@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx, LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); ++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); + LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); -@@ -734,6 +738,17 @@ hal_drive_from_udi (LibHalContext *ctx, - if (raw_device != NULL) { - g_free (drive->priv->device); +@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx, drive->priv->device = raw_device; -+ } -+ + } + + if (cam_device != NULL) { + g_free (drive->priv->device); + drive->priv->device = cam_device; @@ -33,6 +41,8 @@ + drive->priv->cdrecord_device = cam_path; + } else { + drive->priv->cdrecord_device = g_strdup (drive->priv->device); - } - ++ } ++ drive->priv->drive_udi = g_strdup (udi); + drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); + /* we do not own write_speeds so do not free it. */ |