[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.30 
graveman/current/src/callbacks.c:1.31
--- graveman/current/src/callbacks.c:1.30       Fri Mar  4 01:16:38 2005
+++ graveman/current/src/callbacks.c    Fri Mar 11 23:31:13 2005
@@ -904,7 +904,7 @@
   GtkWidget *Lconfirm;
   gint Lrep;
 
-  if (waiting_for_user(Lg, _MEDIA_CDR + _MEDIA_NOBLANK + _MEDIA_APPENDABLE, 
NULL, "dstothercombo", _MEDIA_NONE, NULL, NULL)==FALSE) return;
+  if (waiting_for_user("", Lg, _MEDIA_CDR + _MEDIA_NOBLANK + 
_MEDIA_APPENDABLE, NULL, "dstothercombo")==FALSE) return;
   
   /* confirmation debut de l'operation */ 
   Lconfirm = gtk_message_dialog_new(GTK_WINDOW(Lwindow1),
@@ -978,7 +978,7 @@
   Tgrave *Ldialoghash;
   GtkWidget *Lconfirm;
 
-  if (waiting_for_user(Lg, _MEDIA_CDRW + _MEDIA_NOBLANK, NULL, 
"dstothercombo", _MEDIA_NONE, NULL, NULL)==FALSE) return;
+  if (waiting_for_user("", Lg, _MEDIA_CDRW + _MEDIA_NOBLANK, NULL, 
"dstothercombo")==FALSE) return;
 
   Ldialoghash = create_dialog_confirm_operation(Lwindow1, _("Do you really 
want to erase the CD-RW ?"),
         _("_Fast blank disk when erasing CD-RW"), 
conf_get_boolean("fastblank"));
@@ -1044,7 +1044,7 @@
     Ltxt = _("Do you really want to create an audio cd ?");
     Ltitle = _("Writing audio cd in progress...");
     g_strlcpy(Ldevicename1, "dstaudiocombo", sizeof(Ldevicename1)-1);
-    Lmediarequis1 = _MEDIA_CDR + _MEDIA_APPENDABLE;
+    Lmediarequis1 = _MEDIA_CDR + _MEDIA_BLANKORAPPENDABLE;
   } else if (g_str_has_prefix(Lname, "btnburndata") || g_str_has_prefix(Lname, 
"btnburndvddata")) {
     GtkTreeIter Liter;
     GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_data(Lg, "_current_list")));
@@ -1080,7 +1080,7 @@
       }
       if (!Liso) {
         Ltitle = _("Writing data cd in progress...");
-        Lmediarequis1 = _MEDIA_CDR + _MEDIA_APPENDABLE;
+        Lmediarequis1 = _MEDIA_CDR + _MEDIA_BLANKORAPPENDABLE;
       } else {
         Ltitle = _("Writing iso image in progress...");
       }
@@ -1097,15 +1097,16 @@
     g_strlcpy(Ldevicename1, "srccopycombo", sizeof(Ldevicename1)-1);
     if (!is_an_iso(Lg, Ldevicename1)) Lmediarequis1 = _MEDIA_CD + 
_MEDIA_NOBLANK;
     g_strlcpy(Ldevicename2, "dstcopycombo", sizeof(Ldevicename2)-1);
-    if (!is_an_iso(Lg, Ldevicename2)) Lmediarequis2 = _MEDIA_CDR + 
_MEDIA_APPENDABLE;
+printf("devname2 == > %s\n", Ldevicename2);    
+    if (!is_an_iso(Lg, Ldevicename2)) Lmediarequis2 = _MEDIA_CDR + 
_MEDIA_BLANKORAPPENDABLE;
   }
 
   if (Lmediarequis1 != _MEDIA_NONE) Ldevice1 = sc_grave_get_widget(Lg, 
Ldevicename1);
   if (Lmediarequis2 != _MEDIA_NONE) Ldevice2 = sc_grave_get_widget(Lg, 
Ldevicename2);
  
   /* attente que l'utilisateur ai bien insere un cd */
-  if (waiting_for_user(Lg, Lmediarequis1, &Lmediadetect1, Ldevicename1,
-                           Lmediarequis2, &Lmediadetect2, 
Ldevicename2)==FALSE) return;
+  if (waiting_for_user("", Lg, Lmediarequis1, &Lmediadetect1, 
Ldevicename1)==FALSE) return;
+  if (waiting_for_user("", Lg, Lmediarequis2, &Lmediadetect2, 
Ldevicename2)==FALSE) return;
 
   /* confirmation debut de l'operation */ 
   if (Loperation != WRITE_DVD) {