diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
commit | 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch) | |
tree | 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c | |
parent | - Add USE_XORG= x11 (diff) |
The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD. The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media. Work
is also underway to tie webkit more closely into GNOME. As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.
This release would not have been possible without the contributions and
testing efforts of the following people:
Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon
Notes
Notes:
svn path=/head/; revision=209647
Diffstat (limited to 'sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c')
-rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c index 0210c9f4d32b..a3d5a2949a3e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c @@ -1,29 +1,29 @@ ---- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 -+++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 +--- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 ++++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 @@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_ - 0, drive); - g_signal_emit (G_OBJECT (selection), - nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], -- 0, nautilus_burn_drive_get_device (drive)); -+ 0, nautilus_burn_drive_get_cdrecord_device (drive)); + 0, drive); + g_signal_emit (G_OBJECT (selection), + nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], +- 0, nautilus_burn_drive_get_device (drive)); ++ 0, nautilus_burn_drive_get_cdrecord_device (drive)); - g_object_notify (G_OBJECT (selection), "device"); - g_object_notify (G_OBJECT (selection), "drive"); + g_object_notify (G_OBJECT (selection), "device"); + g_object_notify (G_OBJECT (selection), "drive"); @@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul - if (drives == NULL) { - device = "/dev/cdrom"; - } else { -- device = nautilus_burn_drive_get_device (drives->data); -+ device = nautilus_burn_drive_get_cdrecord_device (drives->data); - g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); - g_list_free (drives); - } + if (drives == NULL) { + device = "/dev/cdrom"; + } else { +- device = nautilus_burn_drive_get_device (drives->data); ++ device = nautilus_burn_drive_get_cdrecord_device (drives->data); + g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); + g_list_free (drives); + } @@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device - g_return_val_if_fail (selection != NULL, NULL); - g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); + g_return_val_if_fail (selection != NULL, NULL); + g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); -- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; -+ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; +- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; ++ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; } /** |