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

[sylvain cresto]

Index: graveman/current/src/callbacks.c
diff -u graveman/current/src/callbacks.c:1.7 
graveman/current/src/callbacks.c:1.8
--- graveman/current/src/callbacks.c:1.7        Sat Jan 29 18:33:37 2005
+++ graveman/current/src/callbacks.c    Tue Feb  1 02:35:19 2005
@@ -925,11 +925,13 @@
   GHashTable *Ldialoghash;
   GtkWidget *Lconfirm;
   gint Lrep;
-  gboolean Luseautoblank;
+  gboolean Luseautoblank = FALSE;
   const gchar *Lname;
   gchar *Ltxt = NULL;
   gchar *Ltitle = NULL;
   GtkWidget *Lwindow1 = GTK_WIDGET(g_hash_table_lookup(Lhash, "topwindow"));
+  GtkWidget *Ldevice;
+  gboolean Lwritercdrw;
 
   Lname = gtk_widget_get_name(Abtn);
 
@@ -952,6 +954,7 @@
     }
     Ltxt = _("Do you really want to create an audio cd ?");
     Ltitle = _("Writing audio cd in progress...");
+    Ldevice = g_hash_table_lookup(Lhash, "dstaudiocombo");
   } else if (g_str_has_prefix(Lname, "btnburndata")) {
     GtkTreeIter Liter;
     GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(g_hash_table_lookup(Lhash, "LISTEDATA")));
@@ -968,34 +971,42 @@
       gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       return;
-
     }
     Ltxt = _("Do you really want to create a data cd ?");
     Ltitle = _("Writing data cd in progress...");
+    Ldevice = g_hash_table_lookup(Lhash, "dstdatacombo");
   } else {
     /* copie de cd */
     Ltxt = _("Do you really want to start the copy ?");
     Ltitle = _("Copying in progress...");
+    Ldevice = g_hash_table_lookup(Lhash, "dstcopycombo");
   }
  
   /* confirmation debut de l'operation */ 
-  Ldialoghash = create_dialog_confirm_operation(Lwindow1, Ltxt, _("Blank CD-RW 
before writing"), conf_get_boolean("autoblank"));
+  /* on affiche l'option "effacer le CDRW que lorsque c'est un graveur qui le 
permet .. */
+  Lwritercdrw = DRIVE_CDRW_WRITER(get_drive_cmb(GTK_COMBO_BOX(Ldevice))) ? 
TRUE : FALSE;
+  Ldialoghash = create_dialog_confirm_operation(Lwindow1, Ltxt,
+       Lwritercdrw == TRUE ? _("Blank CD-RW before writing") : NULL, 
conf_get_boolean("autoblank"));
   Lconfirm = g_hash_table_lookup(Ldialoghash, "window");
 
   Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
 
-  gtk_widget_destroy(Lconfirm);
-
   if (Lrep == GTK_RESPONSE_YES) {
     /* ok go ! */
-    GtkToggleButton *Labcheck = 
GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ldialoghash, "checkbox"));
+    GtkCheckButton *Labcheck = 
GTK_CHECK_BUTTON(g_hash_table_lookup(Ldialoghash, "checkbox"));
 
     g_assert(GTK_IS_WIDGET(Labcheck));
-    Luseautoblank = gtk_toggle_button_get_active(Labcheck);
+    if (Lwritercdrw == TRUE) {
+      Luseautoblank = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Labcheck));
+    }
+
+    gtk_widget_destroy(Lconfirm);
 
     g_hash_table_insert(Lhash, "useautoblank", &Luseautoblank);
     show_graverwindow(Lhash, (gchar *)Lname, Ltitle);
     g_hash_table_remove(Lhash, "useautoblank");
+  } else {
+    gtk_widget_destroy(Lconfirm);
   }
 
   g_hash_table_destroy(Ldialoghash);