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

[sylvain cresto]

Index: graveman/current/src/matos.c
diff -u graveman/current/src/matos.c:1.22 graveman/current/src/matos.c:1.23
--- graveman/current/src/matos.c:1.22   Mon Mar 21 00:55:22 2005
+++ graveman/current/src/matos.c        Tue Mar 22 00:27:13 2005
@@ -600,9 +600,10 @@
   gchar *Ldrive;
   gint *Lrequis;
   gint Lmedialu;
-  gboolean Lstatusmedia;
+  gboolean Lstatusmedia = FALSE;
   gint i;
   gboolean LnewCont = FALSE;
+  gboolean *Linitdisp = (gboolean *) sc_grave_get_data(Lg, "initdisp");
   
   for (i=1; 1; i++) {
     Ldrive = sc_grave_get_datav(Lg, "device%d", i);
@@ -611,11 +612,20 @@
     Lrequis = (gint *) sc_grave_get_datav(Lg, "devicerequis%d", i);
     Ldetect = (gint *) sc_grave_get_datav(Lg, "detect%d", i);
     Lmedialu = 0;
+
+    if (Linitdisp && *Linitdisp) {
+      set_waitwindow_title(Lstatusmedia, *Lrequis, i, Lg);
+      gtk_widget_show(GTK_WIDGET(sc_grave_get_data(Lg, "window")));
+      gdk_flush ();
+      *Linitdisp = FALSE;
+    }
     
+   printf("la DVD ?!\n"); 
     if (*Lrequis & _MEDIA_IS_DVD) {
       Lmedialu += get_dvdinfo(Ldrive, NULL);
     }
 
+   printf("la CD ?!\n"); 
     if (*Lrequis & _MEDIA_IS_CD) {
       Lmedialu += get_cdinfo(Ldrive, NULL);
     }
@@ -630,6 +640,7 @@
     if (Lstatusmedia) LnewCont = TRUE;
     
     set_waitwindow_title(Lstatusmedia, *Lrequis, i, Lg);
+    gdk_flush ();
   }
 
   if (LnewCont == FALSE) *Lcont = 0;
@@ -647,6 +658,7 @@
   gchar *Lident2 = NULL, *Ldevicetitle2 = NULL;
   gint Lcont = 2;
   gboolean Labort = FALSE;
+  gboolean Linit = TRUE;
   guint Ltimeout = 0;
   GtkTreeIter Liter;
   
@@ -677,11 +689,14 @@
   gtk_window_set_transient_for(GTK_WINDOW(Lwindow), GTK_WINDOW(Lparent));
   gtk_window_set_position(GTK_WINDOW(Lwindow), GTK_WIN_POS_CENTER_ALWAYS);
 
-  gtk_widget_show(Lwindow);
 
+  printf("ici man !\n");
   /* on appele une fois le callback pour verifier que l'utilisateur n'ai pas
    * deja inseré le bon cd qui va bien */
+  sc_grave_set_data(Lwaitg, &Linit, "initdisp");
   callback_waiting_for_user(Lwaitg);
+  sc_grave_del_data(Lwaitg, "initdisp");
+printf("la !!!! !\n");
 
   if (Lcont == 2 && Labort == FALSE) {
     /* apparement non, on affiche la fenetre d'attente */