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

[sylvain cresto]

Index: graveman/current/src/dvdrwformat.c
diff -u graveman/current/src/dvdrwformat.c:1.7 
graveman/current/src/dvdrwformat.c:1.8
--- graveman/current/src/dvdrwformat.c:1.7      Sun Mar 27 23:51:07 2005
+++ graveman/current/src/dvdrwformat.c  Thu Mar 31 22:14:12 2005
@@ -98,7 +98,7 @@
 gboolean perform_format_dvd(Tgrave *Ag, Ttypeformatdvd Aoperation, GError 
**Aerror)
 {
   gchar **Lcmd;
-  gchar *Lcommandline, *Lbufgrav;
+  gchar *Lcommandline;
   gchar *Lmode;
   gboolean Lstatus = FALSE;
   GIOChannel *Lcom, *Lcomerr;
@@ -107,9 +107,7 @@
   gint *Lcont = sc_grave_get_data(Ag, "cont");
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
-  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
-  Tdriveinfo *Ldriv;
-  GSList *Lcurdev;
+  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstothercombo");
 
   if (Aoperation == DVD_FORMAT) {
     Lmode = "";
@@ -119,23 +117,14 @@
     Lmode = "-blank=full";
   }
   
-/* code temporraire .. premiers tests */  
-  Lbufgrav = get_combo_value(Lgraveur);
-  Ldriv = find_drive(Lbufgrav);
-  g_assert(Ldriv);
-  g_free(Lbufgrav);
-  for (Lcurdev = Ldriv->dev; Lcurdev; Lcurdev = g_slist_next(Lcurdev)) {
-    if (!strncmp((gchar *)Lcurdev->data, "/dev", 4)) break;
-  }
-  if (!Ldriv) {
+/*  if (!Ldriv) {
     g_set_error(Aerror, GRAVEMAN_ERROR, _ERR_CONFIGURATION, _("Error you must 
manually add this drive in 'properties dialog' box."));
 
     return FALSE;
-  }
-  /* fin temp */
+  }*/
 
   Lcommandline = g_strdup_printf("%s -gui %s %s",
-      conf_get_string("dvd+rw-format"), Lmode, (gchar *)Lcurdev->data);
+      conf_get_string("dvd+rw-format"), Lmode, get_dvdrwtools_bus(Ldevice)); 
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
   g_free(Lcommandline);