Remove some patches which provide the wrong CD device name to apps such

as sound-juicer.

Reported by:	Scott Nicholson <atomicplayboy@socal.rr.com>

3 files changed, 3 insertions, 41 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 531684648a58..0f9aafaba6b3 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.22.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
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
deleted file mode 100644
index a3d5a2949a3e..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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));
- 
-         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);
-         }
-@@ -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);
- 
--        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;
- }
- 
- /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
index 3ed06173992e..13cfcc6be76e 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -1,5 +1,5 @@
---- src/nautilus-cd-burner.c.orig        Fri Jul 14 10:20:19 2006
-+++ src/nautilus-cd-burner.c        Sun Nov 19 13:41:34 2006
+--- src/nautilus-cd-burner.c.orig	2008-01-21 11:16:24.000000000 -0500
++++ src/nautilus-cd-burner.c	2008-04-02 16:48:23.000000000 -0400
 @@ -27,6 +27,8 @@
  
  #include "config.h"
@@ -9,12 +9,3 @@
  #include <time.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di
-                 /* save selections */
-                 gconf_client = gconf_client_get_default ();
-                 gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
--                gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive));
-+                gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive));
-                 g_object_unref (gconf_client);
- 
-                 operation = ncb_operation_new ();