[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.19 graveman/current/src/matos.c:1.20
--- graveman/current/src/matos.c:1.19   Wed Mar  2 00:19:58 2005
+++ graveman/current/src/matos.c        Fri Mar  4 01:16:38 2005
@@ -570,7 +570,9 @@
   if (*Lcd && (Atypecd & _MEDIA_IS_DVD)) {
     strncat(Lcd, _(" or "), sizeof(Lcd)-1);
   }
-  if (Atypecd & _MEDIA_DVDR) {
+  if (Atypecd & _MEDIA_DVDRew) {
+    g_snprintf(Lcd, sizeof(Lcd)-1, _("a DVDR/RW"));
+  } else if (Atypecd & _MEDIA_DVDR) {
     g_snprintf(Lcd, sizeof(Lcd)-1, _("a DVDR"));
   } else if ((Atypecd & _MEDIA_DVDPRW) || (Atypecd & _MEDIA_DVDMRW)) {
     g_snprintf(Lcd, sizeof(Lcd)-1, _("a DVDRW"));
@@ -581,7 +583,7 @@
   if (Ainsert) {
     g_snprintf(Ltitle, sizeof(Ltitle)-1, _("Please insert %s in drive %s to 
continue..."), Lcd, Ldrivelib);
   } else {
-    g_snprintf(Ltitle, sizeof(Ltitle)-1, _("Ok there is a %s in drive %s."), 
Lcd, Ldrivelib);
+    g_snprintf(Ltitle, sizeof(Ltitle)-1, _("Ok there is %s in drive %s."), 
Lcd, Ldrivelib);
   }
   gtk_label_set_text(Llabel, Ltitle);
 }
@@ -664,7 +666,7 @@
   sc_grave_set_data(Lwaitg, &Lcont, "cont");
   sc_grave_set_data(Lwaitg, &Labort, "gabort");
   
-  if (Ldriveident1) {
+  if (Ldriveident1 && *Ldriveident1 && Atypecd1 != _MEDIA_NONE) {
     GtkComboBox *Lcombob1 = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
Ldriveident1));
     GtkTreeModel *Lmodelb1 = gtk_combo_box_get_model(Lcombob1);
     if (gtk_combo_box_get_active_iter(Lcombob1, &Liter)) {
@@ -678,7 +680,7 @@
       set_waitwindow_title(TRUE, Atypecd1, 1, Lwaitg);
     }
   }
-  if (Ldriveident2) {
+  if (Ldriveident2 && *Ldriveident2 && Atypecd2 != _MEDIA_NONE) {
     GtkComboBox *Lcombob2 = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
Ldriveident2));
     GtkTreeModel *Lmodelb2 = gtk_combo_box_get_model(Lcombob2);
     if (gtk_combo_box_get_active_iter(Lcombob2, &Liter)) {
@@ -724,6 +726,16 @@
   return (Lcont == 0 && Labort == FALSE);
 }
 
+gboolean is_an_iso(Tgrave *Ag, gchar *Aname)
+{
+  gboolean Lstatus = FALSE;
+  gchar *Liso = get_combo_value(sc_grave_get_widget(Ag, Aname));
+printf("=%s= iso? %s\n", Aname, Liso);
+  Lstatus = !strcmp(Liso, "iso");
+
+  return Lstatus;
+}
+
 /*
  * vim:et:ts=8:sts=2:sw=2
  */