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

[sylvain cresto]

Index: graveman/current/src/dvdrwformat.c
diff -u graveman/current/src/dvdrwformat.c:1.4 
graveman/current/src/dvdrwformat.c:1.5
--- graveman/current/src/dvdrwformat.c:1.4      Tue Feb 15 22:44:44 2005
+++ graveman/current/src/dvdrwformat.c  Sat Feb 19 17:49:08 2005
@@ -38,10 +38,10 @@
 gboolean dvdrwformat_callback(GIOChannel *Astd, GIOCondition Acond, gpointer 
Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
-  gint *Lcont = (gint *)g_hash_table_lookup(Lhash, "cont");
-  GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
-  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, 
"progress"));
+  Tgrave *Lg = (Tgrave *)Adata;
+  gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
+  GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* pointeur 
erreur */
+  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"progress"));
   gchar *Lbuffer;
   gchar *s, *p;
   gdouble Lpct;
@@ -95,7 +95,7 @@
 }
   
 /* effacer un dvd */
-gboolean perform_format_dvd(GHashTable *Ahash, Ttypeformatdvd Aoperation, 
GError **Aerror)
+gboolean perform_format_dvd(Tgrave *Ag, Ttypeformatdvd Aoperation, GError 
**Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav;
@@ -104,10 +104,10 @@
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   gint g_out, g_err, Lnbrarg;
-  gint *Lcont = g_hash_table_lookup(Ahash, "cont");
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
-  gboolean *Labort = (gboolean *)g_hash_table_lookup(Ahash, "gabort");
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstothercombo");
+  gint *Lcont = sc_grave_get_data(Ag, "cont");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
+  gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
   Tdriveinfo *Ldriv;
   GSList *Lcurdev;
 
@@ -155,13 +155,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),
-                                      dvdrwformat_callback, Ahash);
+                                      dvdrwformat_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),
-                                      dvdrwformat_callback, Ahash);  
+                                      dvdrwformat_callback, Ag);  
 
   while (*Lcont > 1 && *Labort == FALSE) {
     gtk_main_iteration();