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

[sylvain cresto]

Index: graveman/current/src/interface.c
diff -u graveman/current/src/interface.c:1.15 
graveman/current/src/interface.c:1.16
--- graveman/current/src/interface.c:1.15       Sat Feb  5 17:31:48 2005
+++ graveman/current/src/interface.c    Tue Feb  8 02:32:57 2005
@@ -722,12 +722,12 @@
   /* onglet graver un cd de donnee */
   glade_to_hash_list(Lxml, Lhash, "datavoli", "datapubl", "dataprep", 
"databibl", "datacopy", "dataabst",
       "datarockridge", "datajoliet", NULL);
-  glade_to_hash_list(Lxml, Lhash, "nbrcddata", "datamulti", "datanotfix", 
"datasimul", NULL);
+  glade_to_hash_list(Lxml, Lhash, "dataappi", "nbrcddata", "datamulti", 
"datanotfix", "datasimul", NULL);
 
   /* onglet graver un dvd de donnee */
   glade_to_hash_list(Lxml, Lhash, "dvddatavoli", "dvddatapubl", "dvddataprep", 
"dvddatabibl", "dvddatacopy",
       "dvddataabst", NULL);
-  glade_to_hash_list(Lxml, Lhash, "nbrdvddata", "dvddatanotfix", 
"dvddatasimul", NULL);
+  glade_to_hash_list(Lxml, Lhash, "dvddataappi", "nbrdvddata", 
"dvddatanotfix", "dvddatasimul", NULL);
  
   /* onglet copier un cd */
   glade_to_hash_list(Lxml, Lhash, "nbrcdcopy", "copysimul", NULL);
@@ -1160,7 +1160,7 @@
 
   /* on attache les variables utilisees lors de l'operation */
   g_hash_table_insert(Ahash, "totaldone", &Ltotaldone);
-  g_hash_table_insert(Ahash, "gabort", &Labort);  /* operation annuler par 
l'utilisateur ? */
+  g_hash_table_insert(Ahash, "gabort", &Labort);  /* operation annulee par 
l'utilisateur ? */
   g_hash_table_insert(Ahash, "pid", &Lpid);
   g_hash_table_insert(Ahash, "cont", &Lcont);
   g_hash_table_insert(Ahash, "pid2", &Lpid2);
@@ -1177,6 +1177,8 @@
     Lbackvalue = burn_audio(Ahash, &Lerror);
   } else if (g_str_has_prefix(Aaction, "btnburndata")) {
     Lbackvalue = burn_data(Ahash, &Lerror);
+  } else if (g_str_has_prefix(Aaction, "btnburndvddata")) {
+    Lbackvalue = burn_dvddata(Ahash, &Lerror);
   }
 
   if (Labort) {
@@ -1200,7 +1202,7 @@
       
       Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwindowburn),
                       GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                      Lerror->message);
+                      Lerror ? Lerror->message : _("Operation failed"));
     } else {
       gtk_label_set_text(Ltitle, _("Operation successful."));
 
@@ -1617,7 +1619,7 @@
   glade_to_hash(Lxml, Lhash, "label");
   
   /* commencer une session ou merger ? */
-  glade_to_hash(Lxml, Lhash, "burninitial");
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, 
"burninitial")), TRUE);
   glade_to_hash(Lxml, Lhash, "burnmerge");
 
   return Lhash;
@@ -1695,6 +1697,7 @@
 
   /** onglet "Programmes externes" **/
   glade_to_hash_list(Lxml, Lhash, "cdrecord", "cdrecordlbl", "cdrecordpara", 
NULL);
+  glade_to_hash_list(Lxml, Lhash, "cdrdao", "cdrdaolbl", "cdrdaopara", NULL);
   glade_to_hash_list(Lxml, Lhash, "mkisofs", "mkisofslbl", "mkisofspara", 
NULL);
   glade_to_hash_list(Lxml, Lhash, "readcd", "readcdlbl", "readcdpara", NULL);
   glade_to_hash_list(Lxml, Lhash, "sox", "soxlbl", "soxpara", NULL);