[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.8 graveman/current/src/mkisofs.c:1.9
--- graveman/current/src/mkisofs.c:1.8  Tue Feb 15 22:44:44 2005
+++ graveman/current/src/mkisofs.c      Sat Feb 19 17:49:08 2005
@@ -53,18 +53,18 @@
 }
 
 /* recherche les parametres supplementaires a passer a mkisofs */
-gchar *make_image_getextrapara(GHashTable *Ahash, gchar *Aop)
+gchar *make_image_getextrapara(Tgrave *Ag, gchar *Aop)
 {
-  const gchar *Ldatavoli = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%svoli", Aop)));
-  const gchar *Ldatapubl = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%spubl", Aop)));
-  const gchar *Ldataprep = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%sprep", Aop)));
-  const gchar *Ldatabibl = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%sbibl", Aop)));
-  const gchar *Ldatacopy = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%scopy", Aop)));
-  const gchar *Ldataabst = 
gtk_entry_get_text(GTK_ENTRY(sc_hash_table_lookupv(Ahash, "%sabst", Aop)));
+  const gchar *Ldatavoli = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%svoli", Aop)));
+  const gchar *Ldatapubl = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%spubl", Aop)));
+  const gchar *Ldataprep = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%sprep", Aop)));
+  const gchar *Ldatabibl = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%sbibl", Aop)));
+  const gchar *Ldatacopy = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%scopy", Aop)));
+  const gchar *Ldataabst = 
gtk_entry_get_text(GTK_ENTRY(sc_grave_get_widgetv(Ag, "%sabst", Aop)));
   gchar *Lreturn;
   gchar *Lextra = NULL;
   GtkTextIter Lstart, Lend;
-  GtkTextBuffer *Lbufappi = gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(sc_hash_table_lookupv(Ahash, "%sappi", Aop)));
+  GtkTextBuffer *Lbufappi = gtk_text_view_get_buffer (GTK_TEXT_VIEW 
(sc_grave_get_widgetv(Ag, "%sappi", Aop)));
   char *Ldataappi, *Ltmpappi;
   gtk_text_buffer_get_bounds (Lbufappi, &Lstart, &Lend);
   Ltmpappi = gtk_text_iter_get_text (&Lstart, &Lend);
@@ -72,9 +72,9 @@
   g_free(Ltmpappi);
 
   if (!strcmp(Aop, "data")) { /* data cd */
-    gboolean Lrockridge = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"datarockridge")));
-    gboolean Ljoliet = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"datajoliet")));
-    gchar *Lisolevel = get_combo_value(g_hash_table_lookup(Ahash, 
"dataisolevel"));
+    gboolean Lrockridge = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datarockridge")));
+    gboolean Ljoliet = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datajoliet")));
+    gchar *Lisolevel = get_combo_value(sc_grave_get_widget(Ag, 
"dataisolevel"));
 
     Lextra = g_strdup_printf("%s %s -iso-level %s", Lrockridge == TRUE ? "-r" 
: "", Ljoliet ? "-J" : "", Lisolevel);
     g_free(Lisolevel);
@@ -94,13 +94,13 @@
 gboolean mkisofs_makeimage_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
-  gint *Lcont = (gint *) g_hash_table_lookup(Lhash, "cont"); /* on traite 
encore des donnees ? */
-  GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
-  gint *Ltodo = (gint *) g_hash_table_lookup(Lhash, "todo"); /* nombre de 
piste a traiter */
-  gint *Ldone = (gint *) g_hash_table_lookup(Lhash, "done"); /* nombre de 
piste deja traite */
-  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, 
"pb_total"));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, 
"pb_step"));
+  Tgrave *Lg = (Tgrave *)Adata;
+  gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont"); /* on traite encore 
des donnees ? */
+  GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* pointeur 
erreur */
+  gint *Ltodo = (gint *) sc_grave_get_data(Lg, "todo"); /* nombre de piste a 
traiter */
+  gint *Ldone = (gint *) sc_grave_get_data(Lg, "done"); /* nombre de piste 
deja traite */
+  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_total"));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_step"));
   gchar *Lbuffer = NULL, *f, *Ltxt; 
   gdouble Lpct, Ltava;
   gchar Lsbuf[100], Lsbuf2[100];
@@ -140,7 +140,7 @@
     g_free(Ltxt);
     return FALSE;
   } else if (!strncmp(Lbuffer, MKISOFS_OK, strlen(MKISOFS_OK))) {
-    gboolean *Lopstatus = (gboolean *) g_hash_table_lookup(Lhash, 
"operationstatus");
+    gboolean *Lopstatus = (gboolean *) sc_grave_get_data(Lg, 
"operationstatus");
     /* ok tout s'est bien passe ! */
     gtk_progress_bar_set_fraction(Lprogressbar2, 1);
     gtk_progress_bar_set_text(Lprogressbar2, "100%");
@@ -156,22 +156,22 @@
 }
 
 /* creation image iso */
-gboolean make_iso(GHashTable *Ahash, GError **Aerror)
+gboolean make_iso(Tgrave *Ag, GError **Aerror)
 {
   gboolean Lstatus = FALSE;
   gchar **Lcmd;
   gchar *Lcommandline;
   GIOChannel *Lcomerr, *Lcom;
   guint Lcomerrevent, Lcomevent;
-  gint *Lcont = (gint *)g_hash_table_lookup(Ahash, "cont");
-  gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
-  gchar **Ltmpdir = (gchar **)g_hash_table_lookup(Ahash, "tmpdir");
-  gchar **Lextrapara = (gchar **)g_hash_table_lookup(Ahash, "extrapara");
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
-  gint *Ldone = (gint *)g_hash_table_lookup(Ahash, "done"); /* fais */
-  gchar **Liso = (gchar **)g_hash_table_lookup(Ahash, "iso"); /* image iso */
-  gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Ahash, 
"operationstatus");
-  GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Ahash, "gravetitle"));
+  gint *Lcont = (gint *)sc_grave_get_data(Ag, "cont");
+  gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
+  gchar **Ltmpdir = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  gchar **Lextrapara = (gchar **)sc_grave_get_data(Ag, "extrapara");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
+  gint *Ldone = (gint *)sc_grave_get_data(Ag, "done"); /* fais */
+  gchar **Liso = (gchar **)sc_grave_get_data(Ag, "iso"); /* image iso */
+  gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
   gint g_out, g_err, Lnbrarg;
 
   *Loperationstatus = FALSE;
@@ -202,13 +202,13 @@
   g_io_channel_set_encoding (Lcom, NULL, NULL);
   g_io_channel_set_flags( Lcom, G_IO_FLAG_NONBLOCK, NULL );
   Lcomevent = g_io_add_watch (Lcom, (G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI),
-                                      mkisofs_makeimage_callback, Ahash);
+                                      mkisofs_makeimage_callback, Ag);
 
   Lcomerr = g_io_channel_unix_new( g_err );
   g_io_channel_set_encoding (Lcomerr, NULL, NULL);
   g_io_channel_set_flags( Lcomerr, G_IO_FLAG_NONBLOCK, NULL );
   Lcomerrevent = g_io_add_watch (Lcomerr, (G_IO_IN | G_IO_HUP | G_IO_ERR | 
G_IO_PRI),
-                                      mkisofs_makeimage_callback, Ahash); 
+                                      mkisofs_makeimage_callback, Ag); 
 _DEB("debut !!");
   while (*Lcont > 0 && *Labort == FALSE) {
    gtk_main_iteration();