openbsd-ports/x11/gnome/vfs2/patches/patch-modules_cdda-method_c
marcm 95401581ca Monster update to Gnome 2.6. See, I am not slacking, really!
Change info on a Gnome mirror near you.
2004-06-23 03:26:11 +00:00

32 lines
1.3 KiB
Plaintext

$OpenBSD: patch-modules_cdda-method_c,v 1.1 2004/06/23 03:26:21 marcm Exp $
--- modules/cdda-method.c.orig 2004-01-22 05:29:10.000000000 -0700
+++ modules/cdda-method.c 2004-06-20 10:34:38.000000000 -0600
@@ -623,10 +623,10 @@ do_get_file_info (GnomeVFSMethod *method
/* Check and see if we already have opened and stashed this drive */
if (!use_base) {
if (global_context != NULL) {
-#ifdef __linux__
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
+#else
+ if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
#endif
use_cache = TRUE;
cdda_close (drive);
@@ -713,10 +713,10 @@ do_open_directory (GnomeVFSMethod *metho
if (!use_base) {
/* Check for cache */
if (global_context != NULL) {
-#ifdef __linux__
- if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
+#else
+ if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
#endif
/* Clear old cache */
cdda_context_free (global_context);