[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.31 
graveman/current/src/callbacks.c:1.32
--- graveman/current/src/callbacks.c:1.31       Fri Mar 11 23:31:13 2005
+++ graveman/current/src/callbacks.c    Sun Mar 27 23:51:07 2005
@@ -903,8 +903,13 @@
   GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
   GtkWidget *Lconfirm;
   gint Lrep;
-
-  if (waiting_for_user("", Lg, _MEDIA_CDR + _MEDIA_NOBLANK + 
_MEDIA_APPENDABLE, NULL, "dstothercombo")==FALSE) return;
+  GSList *Llmediarequis = g_slist_append(NULL, GINT_TO_POINTER(_MEDIA_CDR + 
_MEDIA_NOBLANK + _MEDIA_APPENDABLE));
+  gboolean Lstatus;
+  
+  Lstatus = waiting_for_user(_MEDIA_BLANKORAPPENDABLE, Lg, Llmediarequis, 
NULL, "dstothercombo");
+  g_slist_free(Llmediarequis);
+  
+  if (Lstatus==FALSE) return;
   
   /* confirmation debut de l'operation */ 
   Lconfirm = gtk_message_dialog_new(GTK_WINDOW(Lwindow1),
@@ -977,8 +982,14 @@
   GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
   Tgrave *Ldialoghash;
   GtkWidget *Lconfirm;
-
-  if (waiting_for_user("", Lg, _MEDIA_CDRW + _MEDIA_NOBLANK, NULL, 
"dstothercombo")==FALSE) return;
+  GSList *Llmediarequis = g_slist_append(NULL, GINT_TO_POINTER(_MEDIA_CDRW + 
_MEDIA_NOBLANK));
+  gboolean Lstatus;
+printf("tout debut !\n");
+  Lstatus = waiting_for_user(_MEDIA_BLANKORAPPENDABLE, Lg, Llmediarequis, 
NULL, "dstothercombo");
+printf("aprew awit !\n");
+  g_slist_free(Llmediarequis);
+  
+  if (Lstatus==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"));
@@ -1013,7 +1024,9 @@
   gchar *Ltitle = NULL;
   GtkWidget *Lwindow1 = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
   GtkWidget *Ldevice1 = NULL, *Ldevice2 = NULL;
-  gint Lmediarequis1 = _MEDIA_NONE, Lmediarequis2 = _MEDIA_NONE;
+  GSList *Llmediarequis1 = NULL;
+  GSList *Llmediarequis2 = NULL;
+  gint Lmediatitle1 = _MEDIA_NONE, Lmediatitle2 = _MEDIA_NONE;
   gint Lmediadetect1 = _MEDIA_NONE, Lmediadetect2 = _MEDIA_NONE;
   gchar Ldevicename1[_BUF_SIZE], Ldevicename2[_BUF_SIZE];
   gboolean Lwritercdrw;
@@ -1044,7 +1057,12 @@
     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_BLANKORAPPENDABLE;
+    Llmediarequis1 = g_slist_append(Llmediarequis1, GINT_TO_POINTER(_MEDIA_CDR 
+ _MEDIA_BLANK));
+    Llmediarequis1 = g_slist_append(Llmediarequis1, GINT_TO_POINTER(_MEDIA_CDR 
+ _MEDIA_APPENDABLE));
+    Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_BLANK));
+    Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_APPENDABLE));
+    Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_NOBLANK));
+    Lmediatitle1 = _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 +1098,12 @@
       }
       if (!Liso) {
         Ltitle = _("Writing data cd in progress...");
-        Lmediarequis1 = _MEDIA_CDR + _MEDIA_BLANKORAPPENDABLE;
+        Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDR + _MEDIA_BLANK));
+        Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDR + _MEDIA_APPENDABLE));
+        Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_BLANK));
+        Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_APPENDABLE));
+        Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_NOBLANK));
+        Lmediatitle1 = _MEDIA_BLANKORAPPENDABLE;
       } else {
         Ltitle = _("Writing iso image in progress...");
       }
@@ -1088,25 +1111,42 @@
       Ltxt = _("Do you really want to create a data dvd ?");
       Ltitle = _("Writing data dvd in progress...");
       g_strlcpy(Ldevicename1, "dstdvddatacombo", sizeof(Ldevicename1)-1);
-      Lmediarequis1 = _MEDIA_DVDRew;
+      Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDR + _MEDIA_BLANK));
+      Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDR + _MEDIA_APPENDABLE));
+      Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDPRW));
+      Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_DVDMRW));
+      Lmediatitle1 = _MEDIA_DVDRew;
     }
   } else {
     /* copie de cd */
     Ltxt = _("Do you really want to start the copy ?");
     Ltitle = _("Copying in progress...");
     g_strlcpy(Ldevicename1, "srccopycombo", sizeof(Ldevicename1)-1);
-    if (!is_an_iso(Lg, Ldevicename1)) Lmediarequis1 = _MEDIA_CD + 
_MEDIA_NOBLANK;
+    if (!is_an_iso(Lg, Ldevicename1)) {
+      Llmediarequis1 = g_slist_append(Llmediarequis1, 
GINT_TO_POINTER(_MEDIA_CD + _MEDIA_NOBLANK));
+      Lmediatitle1 = _MEDIA_CD;
+    }
     g_strlcpy(Ldevicename2, "dstcopycombo", sizeof(Ldevicename2)-1);
 printf("devname2 == > %s\n", Ldevicename2);    
-    if (!is_an_iso(Lg, Ldevicename2)) Lmediarequis2 = _MEDIA_CDR + 
_MEDIA_BLANKORAPPENDABLE;
+    if (!is_an_iso(Lg, Ldevicename2)) {
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDR + _MEDIA_BLANK));
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDR + _MEDIA_APPENDABLE));
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_BLANK));
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_APPENDABLE));
+      Llmediarequis2 = g_slist_append(Llmediarequis2, 
GINT_TO_POINTER(_MEDIA_CDRW + _MEDIA_NOBLANK));
+      Lmediatitle2 = _MEDIA_BLANKORAPPENDABLE;
+    }
   }
 
-  if (Lmediarequis1 != _MEDIA_NONE) Ldevice1 = sc_grave_get_widget(Lg, 
Ldevicename1);
-  if (Lmediarequis2 != _MEDIA_NONE) Ldevice2 = sc_grave_get_widget(Lg, 
Ldevicename2);
+  if (g_slist_length(Llmediarequis1)) Ldevice1 = sc_grave_get_widget(Lg, 
Ldevicename1);
+  if (g_slist_length(Llmediarequis2)) Ldevice2 = sc_grave_get_widget(Lg, 
Ldevicename2);
  
   /* attente que l'utilisateur ai bien insere un cd */
-  if (waiting_for_user("", Lg, Lmediarequis1, &Lmediadetect1, 
Ldevicename1)==FALSE) return;
-  if (waiting_for_user("", Lg, Lmediarequis2, &Lmediadetect2, 
Ldevicename2)==FALSE) return;
+printf("attente 1\n");  
+  if (waiting_for_user(Lmediatitle1, Lg, Llmediarequis1, &Lmediadetect1, 
Ldevicename1)==FALSE) return;
+printf("attente 2\n");  
+  if (waiting_for_user(Lmediatitle2, Lg, Llmediarequis2, &Lmediadetect2, 
Ldevicename2)==FALSE) return;
+printf("attente 3\n");  
 
   /* confirmation debut de l'operation */ 
   if (Loperation != WRITE_DVD) {