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

[sylvain cresto]

Index: graveman/current/src/mkisofs.c
diff -u graveman/current/src/mkisofs.c:1.17 graveman/current/src/mkisofs.c:1.18
--- graveman/current/src/mkisofs.c:1.17 Sun Mar 27 23:51:07 2005
+++ graveman/current/src/mkisofs.c      Tue Mar 29 00:10:26 2005
@@ -80,12 +80,17 @@
     gchar *Lcombo = NULL;
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datamulti")))) {
-      Lcombo = get_combo_value(sc_grave_get_widget(Ag, "dstdatacombo"));
-      Lmediainfo = cdrecord_get_mediainfo(Ag, Lcombo, NULL);
+      gboolean *Luseautoblank = (gboolean *) sc_grave_get_data(Ag, 
"useautoblank");
+
+      if (*Luseautoblank == FALSE) {
+        Lcombo = get_combo_value(sc_grave_get_widget(Ag, "dstdatacombo"));
+        Lmediainfo = cdrecord_get_mediainfo(Ag, Lcombo, NULL);
+      }
     }
 
     Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == 
TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
-        Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lcombo ? "-M " 
: "", Lcombo ? Lcombo : "");
+        Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lcombo && 
Lmediainfo ? "-M " : "",
+        Lcombo && Lmediainfo ? Lcombo : "");
     g_free(Lmediainfo);
     g_free(Lisolevel);
   } else {  /* data dvd */
@@ -96,7 +101,7 @@
   if ((Lreturn = conf_get_string("inputcharset"))) {
     Linputcharset = g_strdup_printf("-input-charset %s", Lreturn);
   }
-  
+printf("ISO! ca le fais man ?\n");  
   Lreturn = g_strdup_printf("-V \"%s\" -A \"%s\" -publisher \"%s\" -p \"%s\" 
-biblio \"%s\" -copyright \"%s\" "
             "-abstract \"%s\" %s %s",
             _NN(Ldatavoli), _NN(Ldataappi), _NN(Ldatapubl), _NN(Ldataprep), 
_NN(Ldatabibl), _NN(Ldatacopy),
@@ -137,6 +142,7 @@
     /* avancement tache */
     Lpct = 0.01 * atof(f);
     gtk_progress_bar_set_fraction(Lprogressbar2, Lpct);
+    g_snprintf(Lsbuf, sizeof(Lsbuf)-1, "%s%%", f);
     gtk_progress_bar_set_text(Lprogressbar2, Lsbuf);
     /* avancement total */
     Ltava = (1.0 / (*Ltodo)) * ((*Ldone)-1+Lpct);
@@ -191,7 +197,7 @@
 
   *Loperationstatus = FALSE;
   gtk_label_set_text(Ltitle, _("Writing image..."));
-
+printf("extrapara mkisofs => [%s]\n", Lextrapara);
   Lcommandline = g_strdup_printf("%s %s %s -o %s -graft-points -path-list %s", 
       conf_get_string("mkisofs"), Lextrapara, conf_get_string("mkisofspara"), 
Liso, Ltmpdir);