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

[sylvain cresto]

Index: graveman/current/src/growisofs.c
diff -u graveman/current/src/growisofs.c:1.5 
graveman/current/src/growisofs.c:1.6
--- graveman/current/src/growisofs.c:1.5        Sat Feb 19 17:49:08 2005
+++ graveman/current/src/growisofs.c    Sun Feb 20 17:45:02 2005
@@ -35,7 +35,7 @@
 
 /* mise a jour du titre depuis le template prepare avec prepare_title */
 void set_title(Tgrave *Ag, gchar *Avitesse) {
-  GtkLabel *Llabel = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkLabel *Llabel = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   gchar *Ltitleshow = g_strdup_printf(_("Writing DVD in progress at %sx..."), 
Avitesse);
 
   gtk_label_set_text(Llabel, Ltitleshow);
@@ -66,9 +66,9 @@
   Tgrave *Lg = (Tgrave *)Adata;
   gchar *Lbuffer;
   gchar *s, *t;
-  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_total"));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_step"));
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
+  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_total"));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_step"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Lg, "gravetitle"));
   GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* pointeur 
erreur */
   gdouble Lpct, Ltava;
   gchar Lsbuf[100], Lsbuf2[100];
@@ -98,7 +98,7 @@
     /* rien pour le moment */
   } else if (strstr(Lbuffer, GROWISOFS_DONE)) {
     /* gravure en cours ... */
-    if ((t=strchr(Lbuffer, '%'))) {
+    if ((t=strchr(Lbuffer, '.'))) {
       s=ltrim(Lbuffer);
 
       /* avancement tache */
@@ -142,10 +142,10 @@
 gboolean burn_dvd(Tgrave *Ag, GError **Aerror) {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav, *Ltxt;
-  gchar **Lrepertoire = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  gchar *Lrepertoire = (gchar *)sc_grave_get_data(Ag, "tmpdir");
   gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont");
   gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
-  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_widget(Ag, "window_burn"));
+  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"dvddatasimul")));
   gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrdvddata"))); 
   gint *Ldone = (gint *)sc_grave_get_data(Ag, "done"); /* fais */
@@ -156,7 +156,7 @@
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstdvddataspeed");
   GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdvddatacombo");
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   gboolean Leject = FALSE;
   gboolean Ldosimul;
   gchar *Lbufvitesse;
@@ -224,7 +224,7 @@
         conf_get_boolean("overburn") ? "-overburn" : "",
         Ldosimul ? ",dummy" : "",  /* simulation ? */
         Lisopara,  /* parametres supplementaires tel que le nom de volume du 
cd */
-        *Lrepertoire
+        Lrepertoire
       );
 
     _DEB("execution [%s]\n", Lcommandline);
@@ -235,7 +235,7 @@
       break;
     }
 
-    Lstatus = g_spawn_async_with_pipes(*Lrepertoire, Lcmd, NULL, /* env 
argument */
+    Lstatus = g_spawn_async_with_pipes(Lrepertoire, Lcmd, NULL, /* env 
argument */
         (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);