diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-28 01:01:08 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-28 01:01:08 +0800 |
commit | c9721138d6865ce3d9d835b6c26d89522e5bcab5 (patch) | |
tree | b6343082771f5799bd5b776490b5964e220c0478 /sysutils | |
parent | 728fe4bd2c11aa1ac1e8a528935cb423a13fac9e (diff) | |
download | marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar.gz marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar.bz2 marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar.lz marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar.xz marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.tar.zst marcuscom-ports-c9721138d6865ce3d9d835b6c26d89522e5bcab5.zip |
Remove this (to be immediately re-added).
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@816 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-cd-recorder.c | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c deleted file mode 100644 index c6d0b9324..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c +++ /dev/null @@ -1,96 +0,0 @@ ---- cd-recorder.c.orig Mon May 19 03:17:14 2003 -+++ cd-recorder.c Thu May 22 19:10:49 2003 -@@ -9,10 +9,16 @@ - #include <fcntl.h> - #include <sys/wait.h> - #include <sys/types.h> -+#ifdef __FreeBSD__ -+#include <sys/uio.h> -+#include <unistd.h> -+#endif - #include <sys/stat.h> - #include <sys/ioctl.h> -+#ifndef __FreeBSD__ - #include <scsi/scsi.h> - #include <scsi/sg.h> -+#endif - #include <glib.h> - #include <signal.h> - #include <libgnome/gnome-i18n.h> -@@ -41,9 +47,9 @@ - GMainLoop *loop; - int result; - int pid; -- int stdin; -+ int cdr_stdin; - GString *line; -- GString *stderr; -+ GString *cdr_stderr; - gboolean changed_text; - gboolean send_return; - gboolean expect_cdrecord_to_die; -@@ -112,7 +118,7 @@ - { - if (is_reload) { - if (cdrecorder->priv->send_return) { -- write (cdrecorder->priv->stdin, "\n", 1); -+ write (cdrecorder->priv->cdr_stdin, "\n", 1); - } else { - kill (cdrecorder->priv->pid, SIGUSR1); - } -@@ -221,7 +227,7 @@ - #endif - /* TODO: Handle errors */ - if (status == G_IO_STATUS_NORMAL && !cdrecorder->priv->expect_cdrecord_to_die) { -- g_string_prepend (cdrecorder->priv->stderr, line); -+ g_string_prepend (cdrecorder->priv->cdr_stderr, line); - if (strstr (line, "No disk / Wrong disk!") != NULL) { - g_signal_emit (G_OBJECT (cdrecorder), - cd_recorder_table_signals[INSERT_CD_REQUEST], 0, -@@ -293,15 +299,15 @@ - argv[i++] = filename; - argv[i++] = NULL; - -- cdrecorder->priv->stderr = NULL; -+ cdrecorder->priv->cdr_stderr = NULL; - retry: - cdrecorder->priv->result = RESULT_ERROR; - cdrecorder->priv->expect_cdrecord_to_die = FALSE; - cdrecorder->priv->line = NULL; -- if (cdrecorder->priv->stderr != NULL) { -- g_string_truncate (cdrecorder->priv->stderr, 0); -+ if (cdrecorder->priv->cdr_stderr != NULL) { -+ g_string_truncate (cdrecorder->priv->cdr_stderr, 0); - } else { -- cdrecorder->priv->stderr = g_string_new (NULL); -+ cdrecorder->priv->cdr_stderr = g_string_new (NULL); - } - - g_signal_emit (G_OBJECT (cdrecorder), -@@ -325,7 +331,7 @@ - G_SPAWN_SEARCH_PATH, - NULL, NULL, - &cdrecorder->priv->pid, -- &cdrecorder->priv->stdin, -+ &cdrecorder->priv->cdr_stdin, - &stdout_pipe, - &stderr_pipe, - &error)) { -@@ -390,7 +396,7 @@ - { - g_return_val_if_fail (cdrecorder->priv->result != RESULT_ERROR, NULL); - -- return (const char *)cdrecorder->priv->stderr->str; -+ return (const char *)cdrecorder->priv->cdr_stderr->str; - } - - const char * -@@ -408,7 +414,7 @@ - - g_return_if_fail (object != NULL); - -- g_string_free (cdrecorder->priv->stderr, TRUE); -+ g_string_free (cdrecorder->priv->cdr_stderr, TRUE); - //FIXME cleanup - - if (G_OBJECT_CLASS (parent_class)->finalize != NULL) { |