[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.12 
graveman/current/src/cdrecord.c:1.13
--- graveman/current/src/cdrecord.c:1.12        Sat Feb  5 17:31:48 2005
+++ graveman/current/src/cdrecord.c     Tue Feb  8 02:32:57 2005
@@ -79,7 +79,7 @@
 
 gboolean cdrecord_grave_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata);
 
-gchar *get_title(gint Anbrgravure, gint Acurcd, gboolean Adosimul)
+static gchar *get_title(gint Anbrgravure, gint Acurcd, gboolean Adosimul)
 {
   gchar *Ltxt = NULL;
   if (Anbrgravure==1) {
@@ -90,7 +90,7 @@
     }
   } else {
     if (!Adosimul) {
-      Ltxt = g_strdup_printf(_("Writing cd %d/%d in progress..."), Acurcd, 
Anbrgravure);
+      Ltxt = g_strdup_printf(_("Writing DVD %d/%d in progress..."), Acurcd, 
Anbrgravure);
     } else {
       Ltxt = g_strdup_printf(_("Simulated CD writing %d/%d in progress..."), 
Acurcd, Anbrgravure);
     }
@@ -182,7 +182,7 @@
 {
   gchar **Lcmd;
   gchar *Lcommandline;
-  gint pid, g_out, Lnbrarg;
+  gint Lpid, g_out, Lnbrarg;
   gboolean Lbolstatus;
   GIOChannel *Lcom;
   gboolean Lstatus;
@@ -205,7 +205,7 @@
 
     Lbolstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
       (GSpawnFlags ) (0),
-      NULL, NULL, &pid, NULL, &g_out, NULL, Aerror);
+      NULL, NULL, &Lpid, NULL, &g_out, NULL, Aerror);
     g_strfreev(Lcmd);
   
     if (Lbolstatus == FALSE) {
@@ -227,7 +227,7 @@
       
     g_io_channel_shutdown(Lcom, FALSE, NULL);
     g_io_channel_unref(Lcom);
-    g_spawn_close_pid(pid);
+    g_spawn_close_pid(Lpid);
     g_hash_table_remove(Ahash, "drivedesc");
   }
 
@@ -404,7 +404,7 @@
     }
 
     Lstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
-        (GSpawnFlags ) (0),
+        (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);
 
@@ -432,6 +432,8 @@
     while (*Lcont > 0 && *Labort == FALSE) {
       gtk_main_iteration();    
     }
+    exit_prog(*Lpid, Aerror, NULL);
+
     g_source_remove(Lcomevent);
     g_source_remove(Lcomerrevent);
       
@@ -780,7 +782,7 @@
     }
 
     Lstatus = g_spawn_async_with_pipes(*Lrepertoire, Lcmd, NULL, /* env 
argument */
-        (GSpawnFlags ) (0),
+        (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);
 
@@ -808,6 +810,7 @@
     while (*Lcont>0 && *Labort == FALSE) {
       gtk_main_iteration(); 
     }
+    exit_prog(*Lpid, Aerror, NULL);
 
     g_source_remove(Lcomerrevent);
     g_source_remove(Lcomevent);
@@ -940,7 +943,7 @@
   }
 
   Lstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
-      (GSpawnFlags ) (0),
+      (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
        NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
   g_strfreev(Lcmd);
 
@@ -966,6 +969,8 @@
 _DEB("fin !!!\n");
   while (*Lcont > 0) { while(gtk_events_pending()) gtk_main_iteration(); }
 
+  exit_prog(*Lpid, Aerror, NULL);
+
   g_source_remove(Lcomerrevent);
   g_source_remove(Lcomevent);
 
@@ -1007,7 +1012,7 @@
   }
 
   Lstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
-      (GSpawnFlags ) (0),
+      (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
        NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
   g_strfreev(Lcmd);
 
@@ -1033,6 +1038,8 @@
 _DEB("fin !!!\n");
   while (*Lcont > 0) { while(gtk_events_pending()) gtk_main_iteration(); }
 
+  exit_prog(*Lpid, Aerror, NULL);
+
   g_source_remove(Lcomerrevent);
   g_source_remove(Lcomevent);