[Graveman-cvs] Changes to graveman/current/src/cdrecord.c

[sylvain cresto]

Index: graveman/current/src/cdrecord.c
diff -u graveman/current/src/cdrecord.c:1.10 
graveman/current/src/cdrecord.c:1.11
--- graveman/current/src/cdrecord.c:1.10        Wed Feb  2 23:07:24 2005
+++ graveman/current/src/cdrecord.c     Thu Feb  3 03:20:34 2005
@@ -59,8 +59,7 @@
 /* effacer un cdrw ou cloturer un cdr */
 #define CDRECORD_BLANKING_TIME "Blanking time:"
 #define CDRECORD_CANNOT_BLANK "Cannot blank disk, aborting"
-#define CDRECORD_CANNOT_FORMAT "cannot format medium"
-#define CDRECORD_INCOMPATIBLE_MEDIUM "cannot format medium - incompatible 
medium"
+#define CDRECORD_INCOMPATIBLE_MEDIUM "cannot format medium - incmedium"
 #define CDRECORD_FIXATING_TIME "Fixating time:"
 
 
@@ -649,11 +648,11 @@
     g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_NO_CD, _("Error writing CD !"));
     (*Lcont) = 0;
     return FALSE;
-  } else if (strstr(Lbuffer, CDRECORD_CANNOT_BLANK) || (strstr(Lbuffer, 
CDRECORD_CANNOT_FORMAT))) {
+  } else if (strstr(Lbuffer, CDRECORD_CANNOT_BLANK)) {
     g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_CANNOT_BLANK, _("Cannot blank 
disk, aborting."));
     (*Lcont) = 0;
     return FALSE;
-  } else if (strstr(Lbuffer, CDRECORD_ERRORDISK)) {
+  } else if ((strstr(Lbuffer, CDRECORD_ERRORDISK)) || (strstr(Lbuffer, 
CDRECORD_INCOMPATIBLE_MEDIUM))) {
     /* erreur pas de cd vierge */
     g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_NO_CD, _("Error, a CD-R/CD-RW is 
required in the cd recorder !"));
     (*Lcont) = 0;
@@ -932,7 +931,6 @@
   g_free(Lbufgrav);
 
   _DEB("execution [%s]\n", Lcommandline);
-  printf("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
   g_free(Lcommandline);