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

[sylvain cresto]

Index: graveman/current/src/interface.c
diff -u graveman/current/src/interface.c:1.35 
graveman/current/src/interface.c:1.36
--- graveman/current/src/interface.c:1.35       Mon Mar 21 00:17:42 2005
+++ graveman/current/src/interface.c    Tue Mar 29 00:10:26 2005
@@ -94,7 +94,7 @@
 
 static Tmyentry Gmodburn[] = {
     { "dao", N_("Disk At Once - DAO (default)"), TRUE, 0 },
-    { "tao", N_("Track At Once  - TAO"), FALSE, 0 },
+    { "", N_("Track At Once  - TAO"), FALSE, 0 },
     { "raw96r", N_("RAW writing - raw96r"), FALSE, 0 },
     { "raw96", N_("RAW writing - raw96"), FALSE, 0 },
     { "raw96p", N_("RAW writing - raw96p"), FALSE, 0 },
@@ -117,7 +117,7 @@
     { NULL }
   };
 
-void remplire_combo_vitesse(GtkComboBox *Acombo, gchar *Alecident, gchar 
*Aselvalue)
+void remplire_combo_vitesse(GtkComboBox *Acombo, Tdriveinfo *Adrive, gchar 
*Aselvalue)
 {
   GtkListStore *Ldata = GTK_LIST_STORE(gtk_combo_box_get_model(Acombo));
   const gchar *Lname = glade_get_widget_name(GTK_WIDGET(Acombo));
@@ -129,13 +129,9 @@
   gboolean Lselok = FALSE;
   gboolean Lisdvd = FALSE;
 
-  
-
-  if (Alecident && *Alecident) {
-    Tdriveinfo *Lundrive = find_drive(Alecident);
-
+  if (Adrive) {
     if (strstr(Lname, "dvd")) Lisdvd = TRUE;
-    Lmaxspeed = Lisdvd ? Lundrive->vitessedvd : Lundrive->vitesse;
+    Lmaxspeed = Lisdvd ? Adrive->vitessedvd : Adrive->vitesse;
   }
 
   gtk_list_store_clear(Ldata);
@@ -239,8 +235,9 @@
     gtk_list_store_append(Ldata, &Liter);
 
     Lcurdrive =g_slist_nth_data(Ldrive->dev, Ldrive->actuperiph);
-    
-    gtk_list_store_set(Ldata, &Liter, 0, Lcurdrive, 1, 
+printf("oui ici on sauve un Ldrive\n");    
+printf("oui ici on sauve un Ldrive [%s]\n", Ldrive->name);    
+    gtk_list_store_set(Ldata, &Liter, 0, Ldrive, 1, 
       DRIVE_ICONE(Ldrive), 2, Ldrive->name, 3, i, -1);
     
     if (Aselvalue && *Aselvalue && Lselok==FALSE) {
@@ -253,7 +250,7 @@
   
   if (Aquoi & TYPE_ISO) { 
     gtk_list_store_append(Ldata, &Liter);
-    gtk_list_store_set(Ldata, &Liter, 0, "iso", 1, GISOpetiteIcone, 2, _("ISO 
file..."), 3, -1, -1);
+    gtk_list_store_set(Ldata, &Liter, 0, NULL, 1, GISOpetiteIcone, 2, _("ISO 
file..."), 3, -1, -1);
 
     if (Aselvalue && Lselok==FALSE && !strcmp(Aselvalue, "iso")) {
       gtk_combo_box_set_active_iter(Acombo, &Liter); 
@@ -1185,9 +1182,12 @@
   } else if (g_str_has_prefix(Aaction, "btnburnaudio")) {
     Lbackvalue = burn_audio(Ag, &Lerror);
   } else if (g_str_has_prefix(Aaction, "btnburndata")) {
+printf("je passe la CD\n");    
     Lbackvalue = burn_data(Ag, &Lerror);
   } else if (g_str_has_prefix(Aaction, "btnburndvddata")) {
+printf("je passe la DVD\n");    
     hide_some_progressbar(Lburng);
+printf("okay ?\n");    
     Lbackvalue = burn_dvddata(Ag, &Lerror);
   }
 
@@ -1417,7 +1417,7 @@
 {
   GtkComboBox *Lcombobox = GTK_COMBO_BOX(sc_grave_get_widgetv(Ag, "%scombo", 
Abasename));
   if (GTK_IS_COMBO_BOX(Lcombobox)) {
-    GtkListStore *Lmodel = gtk_list_store_new(4, G_TYPE_STRING, 
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
+    GtkListStore *Lmodel = gtk_list_store_new(4, G_TYPE_POINTER, 
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
     GtkCellRenderer *Lcellrender;
     GtkWidget *Lbtniso = sc_grave_get_widgetv(Ag, "%sbtn", Abasename);