e18151212d
and new features. Don't believe me? Then see for yourself at http://www.gnome.org/start/2.12/notes/en/. DO NOT USE portupgrade by itself to upgrade to GNOME 2.12. Instead, use the gnome_upgrade.sh script from http://www.marcuscom.com/downloads/gnome_upgrade212.sh. This script will circumvent some potential pitfalls users can see if they use portupgrade by itself. In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special splash screen. The winner of this release's contest is Dominique Goncalves <dominique.goncalves@gmail.com>. His splash screen was inspired by http://art.gnome.org/contests/2.12-splash/83. The FreeBSD GNOME Team would lank to thank the following users for their contributions to this release: Matthew Luckie <mjl@luckie.org.nz> ade sajd on #freebsd-gnome Caelian on #freebsd-gnome mnag Yasuda Keisuke <kysd@po.harenet.ne.jp> Mark Hobden <markhobden@gmail.com> Sergey Akifyev <asa@agava.com> Andreas Kohn For more information on GNOME on FreeBSD, checkout http://www.FreeBSD.org/gnome/. The 2.12 documentation will be posted shortly.
30 lines
961 B
C
30 lines
961 B
C
--- nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005
|
|
+++ nautilus-burn-drive.c Sat Sep 10 20:32:26 2005
|
|
@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path)
|
|
struct cd_toc_entry entry;
|
|
int i;
|
|
#endif
|
|
- int type;
|
|
#ifndef CDROM_DATA_TRACK
|
|
#define CDROM_DATA_TRACK 4
|
|
#endif
|
|
@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path)
|
|
|
|
if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) {
|
|
close (fd);
|
|
+ if (errno == EINVAL)
|
|
+ /* If you try to read the TOC header of a blank disc
|
|
+ * on FreeBSD, you get EINVAL. */
|
|
+ return CDS_NO_INFO;
|
|
return -1;
|
|
}
|
|
|
|
@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_
|
|
*is_blank = mmc_profile & 0x10000;
|
|
|
|
disc_type = get_disc_type (device);
|
|
- disc_type_get_info (disc_type, is_blank, has_data, has_audio);
|
|
+ disc_type_get_info (disc_type, NULL, has_data, has_audio);
|
|
|
|
switch (mmc_profile & 0xFFFF) {
|
|
case -1:
|