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

[sylvain cresto]

Index: graveman/current/src/callbacks.c
diff -u graveman/current/src/callbacks.c:1.34 
graveman/current/src/callbacks.c:1.35
--- graveman/current/src/callbacks.c:1.34       Thu Mar 31 22:14:12 2005
+++ graveman/current/src/callbacks.c    Mon Apr  4 01:37:41 2005
@@ -136,7 +136,7 @@
 
   if (S_ISDIR(Lfi.st_mode)) {
     /* si c'est un repertoire alors on lis tout son contenu et on ajoute
-     * les fichiers qu'il contient */
+     * les fich 
     Lonlynameutf8 = _UTF8(LOnlyName);
     Lnomutf8 = _UTF8(Anom);
@@ -1104,6 +1104,7 @@
       if (!Liso) {
         Ltxt = _("Do you really want to create a data dvd ?");
         Ltitle = _("Writing data dvd in progress...");
+        
         Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDR + _MEDIA_BLANK));
         Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDR + _MEDIA_APPENDABLE));
         Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDPRW));
@@ -1133,7 +1134,7 @@
       Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDR + _MEDIA_APPENDABLE));
       Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_BLANK));
       Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_APPENDABLE));
-      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_NOBLANK));
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_NOBLANK)); 
       Lmediatitle2 = _MEDIA_BLANKORAPPENDABLE;
     }
   }
@@ -1176,7 +1177,17 @@
 
     gtk_widget_destroy(Lconfirm);
 
+    sc_grave_set_data(Lg, Llmediarequis1, "mediarequis1");
+    sc_grave_set_data(Lg, &Lmediatitle1, "mediatitle1");
+    sc_grave_set_data(Lg, Llmediarequis2, "mediarequis2");
+    sc_grave_set_data(Lg, &Lmediatitle2, "mediatitle2");
+    sc_grave_set_data(Lg, Ltxt, "medialabel");
     show_graverwindow(Lg, (gchar *)Lname, Ltitle);
+    sc_grave_del_data(Lg, "medialabel");
+    sc_grave_del_data(Lg, "mediatitle2");
+    sc_grave_del_data(Lg, "mediarequis2");
+    sc_grave_del_data(Lg, "mediatitle1");
+    sc_grave_del_data(Lg, "mediarequis1");
 
     if (Loperation != WRITE_DVD) {
       sc_grave_del_data(Lg, "useautoblank");
@@ -1616,6 +1627,13 @@
   Tgrave *Lg = (Tgrave *)Adata;
   gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
   gboolean *Labort = (gboolean *)sc_grave_get_data(Lg, "gabort");
+  gint *Lpid = (gint *)sc_grave_get_data(Lg, "pid");
+printf(" on va kill !\n");
+  if (*Lpid) {
+    /* on envoi un TERM au process (cdrecord...) pour qu'il s'arrete ! */
+_DEB("kill de %d\n", *Lpid);
+    kill(*Lpid, SIGINT);
+  }
 
   (*Labort) = TRUE;
   (*Lcont) = 1; /* on passe Lcont de 2 a 1 */