diff -p -up nautilus-cd-burner-2.21.5/src/make-iso.c.cdrkit nautilus-cd-burner-2.21.5/src/make-iso.c
--- nautilus-cd-burner-2.21.5/src/make-iso.c.cdrkit 2008-01-21 16:14:52.000000000 +0000
+++ nautilus-cd-burner-2.21.5/src/make-iso.c 2008-01-22 06:30:36.000000000 +0000
@@ -719,7 +719,7 @@ readcd_stderr_line (NautilusBurnProcess
char *pos;
if (line && iso->priv->debug) {
- g_print ("readcd stderr: %s", line);
+ g_print ("readom stderr: %s", line);
}
pos = strstr (line, "addr:");
@@ -833,7 +833,7 @@ cdrdao_stderr_line (NautilusBurnProcess
return TRUE;
}
-/* this is an ugly hack until utf8/iconv support is added into upstream mkisofs */
+/* this is an ugly hack until utf8/iconv support is added into upstream genisoimage */
static gboolean
ncb_mkisofs_supports_utf8 (void)
{
@@ -843,7 +843,7 @@ ncb_mkisofs_supports_utf8 (void)
if (first) {
char *standard_error;
gboolean res;
- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
+ res = g_spawn_command_line_sync ("genisoimage -input-charset utf8", NULL, &standard_error, NULL, NULL);
if (res && !g_strrstr (standard_error, "Unknown charset")) {
supported = TRUE;
} else {
@@ -972,7 +972,7 @@ nautilus_burn_iso_graft_get_info (Nautil
}
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "mkisofs");
+ g_ptr_array_add (argv, "genisoimage");
g_ptr_array_add (argv, "-r");
if (use_joliet) {
g_ptr_array_add (argv, "-J");
@@ -1139,7 +1139,7 @@ mkisofs_stderr_line (NautilusBurnProcess
utf8_filename = ncb_make_valid_utf8 (filename->str);
msg = g_strdup_printf (_("Some files have invalid filenames: \n%s"), utf8_filename);
if (iso->priv->debug) {
- g_print ("mkisofs error: %s\n", msg);
+ g_print ("genisoimage error: %s\n", msg);
}
process_error (iso, msg);
@@ -1253,7 +1253,7 @@ nautilus_burn_iso_make_from_graft (Nauti
}
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "mkisofs");
+ g_ptr_array_add (argv, "genisoimage");
g_ptr_array_add (argv, "-r");
if (use_joliet) {
g_ptr_array_add (argv, "-J");
@@ -1379,7 +1379,7 @@ get_disc_info (NautilusBurnIso *iso,
device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
+ g_ptr_array_add (argv, "readom");
g_ptr_array_add (argv, "-sectors=0-0");
g_ptr_array_add (argv, device_arg);
g_ptr_array_add (argv, "-f=/dev/null");
@@ -1561,7 +1561,7 @@ nautilus_burn_iso_make_from_drive (Nauti
dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
+ g_ptr_array_add (argv, "readom");
g_ptr_array_add (argv, (char *)dev_arg);
g_ptr_array_add (argv, (char *)filename_arg);
g_ptr_array_add (argv, NULL);
diff -p -up nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c.cdrkit nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c
--- nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c.cdrkit 2008-01-21 16:16:16.000000000 +0000
+++ nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c 2008-01-22 06:32:50.000000000 +0000
@@ -374,7 +374,7 @@ cdrecord_stdout_line (NautilusBurnProces
int tmp;
if (line && process->debug) {
- g_print ("cdrecord stdout: %s", line);
+ g_print ("wodim stdout: %s", line);
}
if (sscanf (line, "Track %2u: %d of %d MB written (fifo %d%%) [buf %d%%] %fx.",
@@ -482,7 +482,7 @@ cdrecord_blank_stdout_line (NautilusBurn
NautilusBurnRecorder *recorder = data;
if (line && process->debug) {
- g_print ("cdrecord blank stdout: %s", line);
+ g_print ("wodim blank stdout: %s", line);
}
if (g_str_has_prefix (line, "Re-load disk and hit <CR>") ||
@@ -674,7 +674,7 @@ cdrecord_stderr_line (NautilusBurnProces
NautilusBurnRecorder *recorder = data;
if (line && process->debug) {
- g_print ("cdrecord stderr: %s", line);
+ g_print ("wodim stderr: %s", line);
}
if (strstr (line, "No disk / Wrong disk!") != NULL) {
@@ -1056,7 +1056,7 @@ create_temp_graft_file (char **entries)
return filename;
}
-/* this is an ugly hack until utf8/iconv support is added into upstream mkisofs */
+/* this is an ugly hack until utf8/iconv support is added into upstream genisoimage */
static gboolean
ncb_mkisofs_supports_utf8 (void)
{
@@ -1066,7 +1066,7 @@ ncb_mkisofs_supports_utf8 (void)
if (first) {
char *standard_error;
gboolean res;
- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
+ res = g_spawn_command_line_sync ("genisoimage -input-charset utf8", NULL, &standard_error, NULL, NULL);
if (res && !g_strrstr (standard_error, "Unknown charset")) {
supported = TRUE;
} else {
@@ -1372,7 +1372,7 @@ nautilus_burn_recorder_write_cdrecord (N
err_line_func = cdrdao_stderr_line;
} else {
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrecord");
+ g_ptr_array_add (argv, "wodim");
g_ptr_array_add (argv, "fs=16m");
@@ -1489,7 +1489,7 @@ nautilus_burn_recorder_blank_disc_cdreco
}
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrecord");
+ g_ptr_array_add (argv, "wodim");
dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
g_ptr_array_add (argv, dev_str);
