[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.33 graveman/current/src/matos.c:1.34
--- graveman/current/src/matos.c:1.33   Wed May  4 01:31:06 2005
+++ graveman/current/src/matos.c        Sun May 15 17:37:21 2005
@@ -151,14 +151,15 @@
   Ldrive->bus = g_slist_append(Ldrive->bus, g_strdup(Adrivedesc->bus));
   Ldrive->dev = g_slist_append(Ldrive->dev,
       g_strdup_printf("%s%s", Adrivedesc->useline,
-        strcmp(Adrivedesc->bus, "IDE") && strcmp(Adrivedesc->bus, "DSCSI") ? 
Adev : ""));
+        strcmp(Adrivedesc->bus, "IDE") && strncmp(Adrivedesc->bus, IDENT_SCSI, 
strlen(IDENT_SCSI)) ? 
+          Adev : ""));
 }
 
 /* operation de copie */
 gboolean burn_copy(Tgrave *Ag, GError **Aerror)
 {
-  Tdriveinfo *Lsource = get_drive_info(Ag, "srccopycombo");
-  Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstcopycombo");
+  Tdriveinfo *Lsource = matos_get_drive_info(Ag, "srccopycombo");
+  Tdriveinfo *Lgraveur = matos_get_drive_info(Ag, "dstcopycombo");
   GtkEntry *Llecteuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"srccopybtnvalue"));
   GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstcopybtnvalue"));
   gchar *Ltxt;
@@ -314,7 +315,7 @@
   gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrcddata")));
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datasimul")));
   GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstdatabtnvalue"));
-  Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstdatacombo");
+  Tdriveinfo *Lgraveur = matos_get_drive_info(Ag, "dstdatacombo");
   gboolean *Labort = sc_grave_get_data(Ag, "gabort");
   gint Ldone = 1;
   gchar Ltmpdir[MAXPATHLEN] = "";
@@ -492,7 +493,7 @@
   gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrdvddata")));
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"dvddatasimul")));
   GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstdvddatabtnvalue"));
-  Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstdvddatacombo");
+  Tdriveinfo *Lgraveur = matos_get_drive_info(Ag, "dstdvddatacombo");
   gint Ldone = 1;
   gchar Ltmpdir[MAXPATHLEN] = "";
   gchar *Lextrapara = NULL;
@@ -713,12 +714,12 @@
   return (Lcont == 0 && Labort == FALSE);
 }
 
-Tdriveinfo *get_drive_info(Tgrave *Ag, gchar *Aname)
+Tdriveinfo *matos_get_drive_info(Tgrave *Ag, gchar *Aname)
 {
   return get_combo_value(sc_grave_get_widget(Ag, Aname));
 }
 
-gchar *get_dvdrwtools_bus(Tdriveinfo *Adrive)
+gchar *matos_get_device(Tdriveinfo *Adrive)
 {
   GSList *Lcur;
   gchar *Lcurbus;
@@ -727,7 +728,7 @@
   for (Lcur = Adrive->bus; Lcur; Lcur = g_slist_next(Lcur), i++) {
     Lcurbus = (gchar *) Lcur->data;
 
-    if (!strcmp(Lcurbus, "IDE") || !strcmp(Lcurbus, "DSCSI")) {
+    if (!strcmp(Lcurbus, "IDE") || !strncmp(Lcurbus, IDENT_SCSI, 
strlen(IDENT_SCSI))) {
       return g_slist_nth_data(Adrive->dev, i);
     }
   }
@@ -735,7 +736,7 @@
   return NULL;
 }
 
-gboolean is_an_iso(Tgrave *Ag, gchar *Aname)
+gboolean matos_is_an_iso(Tgrave *Ag, gchar *Aname)
 {
   Tdriveinfo *Ldrive = get_combo_value(sc_grave_get_widget(Ag, Aname));
 
@@ -761,6 +762,13 @@
   return Lcurlist;
 }
 
+/* try to umount device when it's mounted
+ * scan /etc/ftab file to do this */
+gboolean umount_device(Tdriveinfo *Adevice, Tgrave *Ag)
+{
+  
+}
+
 /*
  * vim:et:ts=8:sts=2:sw=2
  */