diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-04-07 00:03:59 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-04-07 00:03:59 +0000 |
| commit | 2eb0fdde7229f3f8c23e50f41b8eedd0bb42513c (patch) | |
| tree | e767720c0bbf0ee86d1afec08a7a15987b972aa4 | |
| parent | f3d7030af9c957593c03b01086f1150d4ee847a3 (diff) | |
| download | nautilus-2eb0fdde7229f3f8c23e50f41b8eedd0bb42513c.tar.gz | |
Fix a compile error in the volume monitor code.
2001-04-06 Gene Z. Ragan <gzr@eazel.com>
Fix a compile error in the volume monitor code.
* libnautilus-extensions/nautilus-volume-monitor.c:
(mount_volume_get_cdda_name), (open_cdda_device),
(locate_audio_cd):
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-volume-monitor.c | 10 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-volume-monitor.c | 10 |
3 files changed, 16 insertions, 12 deletions
@@ -1,3 +1,11 @@ +2001-04-06 Gene Z. Ragan <gzr@eazel.com> + + Fix a compile error in the volume monitor code. + + * libnautilus-extensions/nautilus-volume-monitor.c: + (mount_volume_get_cdda_name), (open_cdda_device), + (locate_audio_cd): + 2001-04-06 Robin * Slomkowski <rslomkow@eazel.com> * configure.in: upped version to 1.0.2.1 too keep diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index e4a13a860..fe734a0b7 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -99,7 +99,7 @@ #define CD_AUDIO_PATH "/dev/cdrom" #define CD_AUDIO_URI "cdda:///dev/cdrom" #define CDDA_SCHEME "cdda" - +#define HAVE_CDDA 1 #include <cdda_interface.h> #include <cdda_paranoia.h> @@ -175,7 +175,7 @@ static GList *get_removable_volumes (void); static GHashTable *create_readable_mount_point_name_table (void); #ifdef HAVE_CDDA -static cdrom_drive *open_cdda_device (GnomeVFSURI *uri); +static gboolean open_cdda_device (GnomeVFSURI *uri); static gboolean locate_audio_cd (void); #endif @@ -645,7 +645,7 @@ mount_volume_get_cdrom_name (NautilusVolume *volume) static void mount_volume_get_cdda_name (NautilusVolume *volume) -{ +{ volume->volume_name = g_strdup (_("Audio CD")); } @@ -1920,8 +1920,6 @@ open_cdda_device (GnomeVFSURI *uri) cdrom_drive *drive; gboolean opened; - g_message ("open_cdda_device"); - device_name = gnome_vfs_uri_get_path (uri); drive = cdda_identify (device_name, FALSE, NULL); @@ -1969,7 +1967,7 @@ locate_audio_cd (void) { uri = gnome_vfs_uri_new (CD_AUDIO_URI); if (uri == NULL) { - return found_one; + return FALSE; } found_drive = open_cdda_device (uri); diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index e4a13a860..fe734a0b7 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -99,7 +99,7 @@ #define CD_AUDIO_PATH "/dev/cdrom" #define CD_AUDIO_URI "cdda:///dev/cdrom" #define CDDA_SCHEME "cdda" - +#define HAVE_CDDA 1 #include <cdda_interface.h> #include <cdda_paranoia.h> @@ -175,7 +175,7 @@ static GList *get_removable_volumes (void); static GHashTable *create_readable_mount_point_name_table (void); #ifdef HAVE_CDDA -static cdrom_drive *open_cdda_device (GnomeVFSURI *uri); +static gboolean open_cdda_device (GnomeVFSURI *uri); static gboolean locate_audio_cd (void); #endif @@ -645,7 +645,7 @@ mount_volume_get_cdrom_name (NautilusVolume *volume) static void mount_volume_get_cdda_name (NautilusVolume *volume) -{ +{ volume->volume_name = g_strdup (_("Audio CD")); } @@ -1920,8 +1920,6 @@ open_cdda_device (GnomeVFSURI *uri) cdrom_drive *drive; gboolean opened; - g_message ("open_cdda_device"); - device_name = gnome_vfs_uri_get_path (uri); drive = cdda_identify (device_name, FALSE, NULL); @@ -1969,7 +1967,7 @@ locate_audio_cd (void) { uri = gnome_vfs_uri_new (CD_AUDIO_URI); if (uri == NULL) { - return found_one; + return FALSE; } found_drive = open_cdda_device (uri); |