mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

Fix a warning seen trying to restore the previous used drive setting.

Browse Source 
Reported by:	mezz
This commit is contained in:
Joe Marcus Clarke 2008-01-06 04:27:00 +00:00
parent a305ad14de
commit 88e496e8e1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=205093
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/nautilus-cd-burner/Makefile
View File

@ -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/}

34
sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
View File

@ -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. */