nautilus-cd-burner r2259 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Tue Dec 16 14:13:26 2008
New Revision: 2259
URL: http://svn.gnome.org/viewvc/nautilus-cd-burner?rev=2259&view=rev

Log:
2008-12-16  Bastien Nocera  <hadess hadess net>

	* src/nautilus-burn-recorder.c (cdrecord_stderr_line):
	Try to detect some errors from wodim in cdrecord mode, as well
	as detecting damaged media (Closes: #458427)



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-burn-recorder.c

Modified: trunk/src/nautilus-burn-recorder.c
==============================================================================
--- trunk/src/nautilus-burn-recorder.c	(original)
+++ trunk/src/nautilus-burn-recorder.c	Tue Dec 16 14:13:26 2008
@@ -745,12 +745,21 @@
                                                          _("Error while writing to disc.  Try a lower speed."),
                                                          NAUTILUS_BURN_RECORDER_RESULT_ERROR);
                 }
-        } else if (strstr (line, "DMA speed too slow") != NULL) {
+	} else if (strstr (line, "Sense Key:") != NULL) {
+		if (strstr (line, "Medium Error") != NULL) {
+			nautilus_burn_process_set_error (process,
+							 _("Error while writing to disc.  The disc is damaged or unreadable."),
+							 NAUTILUS_BURN_RECORDER_RESULT_ERROR);
+		}
+        } else if ((strstr (line, "DMA speed too slow") != NULL)
+        	   || (strstr (line, "wodim: A write error occured.") != NULL)
+        	   || (strstr (line, "wodim: A write error occurred.") != NULL)) {
                 nautilus_burn_process_set_error (process,
                                                  _("The system is too slow to write the CD at this speed. Try a lower speed."),
                                                  NAUTILUS_BURN_RECORDER_RESULT_ERROR);
         }
 
+
         return TRUE;
 }