[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.25 
graveman/current/src/interface.c:1.26
--- graveman/current/src/interface.c:1.25       Thu Feb 17 01:22:53 2005
+++ graveman/current/src/interface.c    Sat Feb 19 17:49:08 2005
@@ -228,8 +228,10 @@
   gboolean Lselok = FALSE;
   gchar *Lcurdrive;
 
-  gtk_list_store_clear(Ldata);
- 
+  if (GTK_IS_LIST_STORE(Ldata)) {
+    gtk_list_store_clear(Ldata);
+  }
+printf("toto la !\n"); 
   for (Lcur = Glistdrives, i=0; Lcur; Lcur = g_slist_next(Lcur), i++) { 
     Ldrive = (Tdriveinfo *)Lcur->data;
     if ((Aquoi & TYPE_ALLWRITER) && (! DRIVE_WRITER(Ldrive))) continue;
@@ -591,15 +593,14 @@
 }
 
 /* fenetre principal */
-GtkWidget* manage_main_window (guint64 *Aaudiolen, guint64 *Aaudiomaxlen,
+Tgrave *manage_main_window (guint64 *Aaudiolen, guint64 *Aaudiomaxlen,
     guint64 *Adatasize, guint64 *Adatamaxsize, guint64 *Advddatasize, guint64 
*Advddatamaxsize)
 {
-  Tgrave *Lg = sc_grave_load(window_main.glade);
+  Tgrave *Lg = sc_grave_load("window_main.glade");
   GtkWidget *Lwindow;
   GtkNotebook *Lbodycdaudio, *Lbodycddata, *Lbodycdcopy, *Lbodycdother, 
*Lbodydvddata;
   GtkHBox *Lmainbody;
   GtkComboBox *Lcombo;
-  GtkButton *Lbtnerasecdrw, *Lbtnformatdvdrw;
   GtkTreeView *Ltreeaudio, *Ltreedata, *Ltopmenu, *Ltreedvddata;
 
   g_assert(Lg);
@@ -607,7 +608,6 @@
   Lmainbody = GTK_HBOX(sc_grave_get_widget(Lg, "mainbody"));
   Lwindow = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
 
-
   /* onglets page de droite */
   Lbodycdaudio = GTK_NOTEBOOK(sc_grave_get_widget(Lg, "bodycdaudio"));
   gtk_widget_reparent(GTK_WIDGET(Lbodycdaudio), GTK_WIDGET(Lmainbody));
@@ -627,7 +627,7 @@
   g_signal_connect(G_OBJECT(Lbodydvddata), "switch-page", 
G_CALLBACK(switchpage), Lg);
 
   /* bouttons barre de gauche */
-  Ltopmenu = sc_grave_get_widget(Lg, "topmenu");
+  Ltopmenu = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "topmenu"));
 
   manage_interface(Lg, MENU_NEW + COMBO_UPDATE);
   update_status_bar_display(Lg);
@@ -656,7 +656,6 @@
       G_CALLBACK(menu_quit), Lg);
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "menuabout")), "activate",
       G_CALLBACK(on_about), Lg);
-
   
   prepare_combobox_vitesse(GTK_COMBO_BOX(sc_grave_get_widget(Lg, 
"dstaudiospeed")));
   prepare_combobox_vitesse(GTK_COMBO_BOX(sc_grave_get_widget(Lg, 
"dstcopyspeed")));
@@ -676,8 +675,8 @@
   prepare_combobox_graveur(Lg, "dstcopy");
 
   prepare_combobox_graveur(Lg, "dstother");
-  prepare_disable_when(lg, "dstothercombo_notcdrw", "btnerasecdrwother1", 
NULL);
-  prepare_disable_when(lg, "dstothercombo_notdvdrw", "btnformatdvdrwother1", 
NULL);
+  prepare_disable_when(Lg, "dstothercombo_notcdrw", "btnerasecdrwother1", 
NULL);
+  prepare_disable_when(Lg, "dstothercombo_notdvdrw", "btnformatdvdrwother1", 
NULL);
   
   /* on rempli les autres combo */
   remplirecombo(GTK_COMBO_BOX(sc_grave_get_widget(Lg, "dataformat")), "", 
Gformatcd,
@@ -713,25 +712,27 @@
 
   /* boutons de la page "autres operations" */
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnerasecdrwother1")), 
"clicked", G_CALLBACK(confirm_erasecdrw), Lg);
-  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnformatdvdrw")), 
"clicked", G_CALLBACK(popup_formatdvdrw), Lg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnformatdvdrwother1")), 
"clicked", G_CALLBACK(popup_formatdvdrw), Lg);
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnfixcdother1")), 
"clicked", G_CALLBACK(confirm_fixcd), Lg);
   
   update_combo_graveur(Lg);
 
   /* menu popup sur les listes */
   Ltreeaudio = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "LISTEAUDIO"));
+
   prepare_popups(Lg);
   prepare_listeaudio(Ltreeaudio);
+
   g_signal_connect(G_OBJECT(Ltreeaudio), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lg);
   g_signal_connect(G_OBJECT(Ltreeaudio), "popup-menu", 
G_CALLBACK(key_popupmenu_addaudio), Lg);
-  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnaddtrack")), 
"clicked", G_CALLBACK(gtk_audio_addtrack), Lg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnaddtrack")), 
"clicked", G_CALLBACK(gtk_audio_addtrack), Lg);
 
   Ltreedata = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "LISTEDATA"));
   prepare_listedata(Ltreedata, _("New CD"));
   g_signal_connect(G_OBJECT(Ltreedata), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lg);
   g_signal_connect(G_OBJECT(Ltreedata), "popup-menu", 
G_CALLBACK(key_popupmenu_addfile), Lg);
-  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnaddfile")), 
"clicked", G_CALLBACK(gtk_data_addfile), Lg);
-  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnadddirectory")), 
"clicked",
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnaddfile")), "clicked", 
G_CALLBACK(gtk_data_addfile), Lg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "btnadddirectory")), 
"clicked",
       G_CALLBACK(gtk_data_adddirectory), Lg);
 
   Ltreedvddata = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "LISTEDVDDATA"));
@@ -777,7 +778,7 @@
   
   gtk_widget_show(Lwindow);
 
-  return Lwindow;
+  return Lg;
 }
 
 /* mise a jour des listes contenant les lecteurs */
@@ -789,16 +790,19 @@
   GtkComboBox *Ldstdvddatacombo = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
"dstdvddatacombo"));
   GtkComboBox *Ldstaudiocombo = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
"dstaudiocombo"));
   GtkComboBox *Ldstothercombo = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
"dstothercombo"));
-  GtkButton *Lbtnburnaudio1 = sc_grave_get_widget(Ag, "btnburnaudio1");
-  GtkButton *Lbtnburnaudio2 = sc_grave_get_widget(Ag, "btnburnaudio2");
-  GtkButton *Lbtnburncopy1 = sc_grave_get_widget(Ag, "btnburncopy1");
-  GtkButton *Lbtnfixcdother1 = sc_grave_get_widget(Ag, "btnfixcdother1");
-  GtkButton *Lbtnerasecdrwother1 = sc_grave_get_widget(Ag, 
"btnerasecdrwother1");
+  GtkButton *Lbtnburnaudio2 = GTK_BUTTON(sc_grave_get_widget(Ag, 
"btnburnaudio2"));
+  GtkButton *Lbtnburncopy1 = GTK_BUTTON(sc_grave_get_widget(Ag, 
"btnburncopy1"));
+  GtkButton *Lbtnfixcdother1 = GTK_BUTTON(sc_grave_get_widget(Ag, 
"btnfixcdother1"));
+  GtkButton *Lbtnerasecdrwother1 = GTK_BUTTON(sc_grave_get_widget(Ag, 
"btnerasecdrwother1"));
   gboolean Lreadcd, Lwritecdr, Lwritecdrw, Lreaddvd, Lwritedvd;
 
   get_current_matos(&Lreadcd, &Lwritecdr, &Lwritecdrw, &Lreaddvd, &Lwritedvd);
-
+printf("toto\n");
+if (GTK_IS_WIDGET(Lsrccopycombo)) {
+  printf("oui !\n");
+}
   remplirecombograveur(Lsrccopycombo, TYPE_ALL + TYPE_ISO, 
conf_get_string("srccopycombo"));
+printf("toto2\n");
   
   remplirecombograveur(Ldstcopycombo, TYPE_ALLWRITER + TYPE_ISO, 
conf_get_string("dstcopycombo"));
   
@@ -814,7 +818,6 @@
     gtk_widget_set_sensitive(GTK_WIDGET(Lbtnburncopy1), FALSE);
   }
   if (Lwritecdr == FALSE) {
-    gtk_widget_set_sensitive(GTK_WIDGET(Lbtnburnaudio1), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(Lbtnburnaudio2), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(Lbtnfixcdother1), FALSE);
   }
@@ -1011,7 +1014,7 @@
   GtkWidget *Ldialog;
   GtkComboBox *Lcombobox;
 
-  g_assert(Lxml);
+  g_assert(Lg);
 
   Ldialog = sc_grave_get_widget(Lg, "dialog_device");
   gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
@@ -1031,7 +1034,7 @@
   Tgrave *Lg = sc_grave_load("dialog_add_device.glade");
   GtkWidget *Ldialog;
 
-  g_assert(Lxml);
+  g_assert(Lg);
 
   Ldialog = sc_grave_get_widget(Lg, "dialog_add_device");
   gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
@@ -1059,7 +1062,7 @@
   gtk_label_set_label(Llabelversion, Ltmp);
   g_free(Ltmp);
 
-  Ldialog = sc_grave_get_widget(Lg, "dialog_about")
+  Ldialog = sc_grave_get_widget(Lg, "dialog_about");
   gtk_dialog_run(GTK_DIALOG(Ldialog));
   gtk_widget_destroy(Ldialog);
 
@@ -1082,7 +1085,7 @@
 /* fenetre gravure d'un cd en cours */
 void show_graverwindow (Tgrave *Ag, gchar *Aaction, gchar *Atitle)
 {
-  GladeXML *Lburng = sc_grave_load("window_burn.glade");
+  Tgrave *Lburng = sc_grave_load("window_burn.glade");
   GtkWidget *Lwindowburn;
   GtkLabel *Ltitle;
   GtkProgressBar *Lpbtotal, *Lpbstep, *Lpbfifo, *Lpbbuffer;
@@ -1104,16 +1107,16 @@
   Lpbtotal = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_total"));
   Lpbstep = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_step"));
   /* pour la conversion des fichiers audio et la pulse bar */
-  sc_grave_set_data(Ahash, "progress", Lpbstep);
+  sc_grave_set_data(Ag, Lpbstep, "progress");
   Lpbfifo = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_fifo"));
   Lpbbuffer = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_buffer"));
 
   /* on attache les variables utilisees lors de l'operation */
-  sc_grave_set_data(Ag, "totaldone", &Ltotaldone);
-  sc_grave_set_data(Ag, "gabort", &Labort);  /* operation annulee par 
l'utilisateur ? */
-  sc_grave_set_data(Ag, "pid", &Lpid);
-  sc_grave_set_data(Ag, "cont", &Lcont);
-  sc_grave_set_data(Ag, "pid2", &Lpid2);
+  sc_grave_set_data(Ag, &Ltotaldone, "totaldone");
+  sc_grave_set_data(Ag, &Labort, "gabort");  /* operation annulee par 
l'utilisateur ? */
+  sc_grave_set_data(Ag, &Lpid, "pid");
+  sc_grave_set_data(Ag, &Lcont, "cont");
+  sc_grave_set_data(Ag, &Lpid2, "pid2");
 
   /* bouton annuler l'operation */
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lburng, "btncancelburn")), 
"clicked", G_CALLBACK(abort_gravure), Ag);
@@ -1127,7 +1130,7 @@
   } else if (g_str_has_prefix(Aaction, "btnburndata")) {
     Lbackvalue = burn_data(Ag, &Lerror);
   } else if (g_str_has_prefix(Aaction, "btnburndvddata")) {
-    hide_some_progressbar(Ahash);
+    hide_some_progressbar(Ag);
     Lbackvalue = burn_dvddata(Ag, &Lerror);
   }
 
@@ -1185,7 +1188,7 @@
     gtk_window_set_transient_for(GTK_WINDOW(sc_grave_get_widget(Lg, 
"window_inprogress")), GTK_WINDOW(Aparent));
   }
 
-  return Lxml;
+  return Lg;
 }
 
 void prepare_combobox_vitesse(GtkComboBox *Acombobox)
@@ -1211,7 +1214,7 @@
   gchar *Lname = g_strdup_printf("%s_isotodisabled%d", Abasename, Lnbr++);
   gchar *Lcur;
 
-  sc_grave_ref_wtd(Ag, Afirst, Lname);
+  sc_grave_ref_wtd(Ag, Lbuf, Lname);
 
   va_start(Largs, Afirst);
   while (*Lbuf++) {
@@ -1233,7 +1236,7 @@
   gchar *Lname = g_strdup_printf("%stodisabled%d", Abasename, Lnbr++);
   gchar *Lcur;
 
-  sc_grave_ref_wtd(Ag, Afirst, Lname);
+  sc_grave_ref_wtd(Ag, Lbuf, Lname);
 
   va_start(Largs, Afirst);
   while (*Lbuf++) {
@@ -1259,25 +1262,22 @@
   if (!gtk_tree_selection_get_selected(Lselection, &Ltreemodel, &Liter)) 
return;
 
   gtk_tree_model_get(Ltreemodel, &Liter, 0, &Lident, -1);
-
-  Lnewclick = sc_grave_get_data(Lg, Lident);
+  Lnewclick = GTK_NOTEBOOK(sc_grave_get_widget(Lg, Lident));
   if (GTK_IS_NOTEBOOK(Lnewclick)) {
-  
     if (GTK_IS_NOTEBOOK(Llstclick)) {
       gtk_widget_hide(GTK_WIDGET(Llstclick));
     }
-    sc_grave_replace_data(Lg, "_lstclicked", Lnewclick);
+    sc_grave_replace_data(Lg, Lnewclick, "_lstclicked");
 
     gtk_widget_show(GTK_WIDGET(Lnewclick));
 
     /* pointeur sur la liste courante pour plus de simplicite */
     if (!strcmp(Lident, "bodycddata")) {
-      sc_grave_replace_data(Lg, "_current_list", sc_grave_get_data(Lg, 
"LISTEDATA"));
+      sc_grave_replace_data(Lg, sc_grave_get_data(Lg, "LISTEDATA"), 
"_current_lisl");
     } else if (!strcmp(Lident, "bodydvddata")) {
-      sc_grave_replace_data(Lg, "_current_list", sc_grave_get_data(Lg, 
"LISTEDVDDATA"));
+      sc_grave_replace_data(Lg, sc_grave_get_data(Lg, "LISTEDVDDATA"), 
"_current_list");
     }
   }
-    
   g_free(Lident);
 }
 
@@ -1298,12 +1298,11 @@
 void manage_interface(Tgrave *Ag, gint Aaction)
 {
   GtkListStore *Lmodel;
-  GtkTreeView *Ltopmenu = sc_grave_get_widget(Ag, "topmenu");
+  GtkTreeView *Ltopmenu = GTK_TREE_VIEW(sc_grave_get_widget(Ag, "topmenu"));
   GtkTreeSelection *Lselection = gtk_tree_view_get_selection(Ltopmenu);
   GtkTreeIter Liter;
   GtkCellRenderer *Lcellrender;
   GtkTreeViewColumn *Lcell;
-  GtkComboBox *Lisolevel;
 
   if (Aaction & MENU_NEW) {
     Lmodel = gtk_list_store_new(3, G_TYPE_STRING, GDK_TYPE_PIXBUF, 
G_TYPE_STRING);
@@ -1351,15 +1350,14 @@
 
   /* mise a jour combo "iso level" */
   if (Aaction & COMBO_UPDATE) {
-    Lisolevel = sc_grave_get_widget(Ag, "dataisolevel");
-    remplirecombo_full(Lisolevel, "", Gisolevel,
+    remplirecombo_full(GTK_COMBO_BOX(sc_grave_get_widget(Ag, "dataisolevel")), 
"", Gisolevel,
         TRUE, conf_get_string("dataisolevel"), 
conf_get_int("mkisofs_support_isov2"));
   }
 }
 
     
 /* preparation du combo contenant la liste du peripherique a utiliser */
-void prepare_combobox_graveur(Trave *Ag, gchar *Abasename)
+void prepare_combobox_graveur(Tgrave *Ag, gchar *Abasename)
 {
   GtkComboBox *Lcombobox = GTK_COMBO_BOX(sc_grave_get_widgetv(Ag, "%scombo", 
Abasename));
   if (GTK_IS_COMBO_BOX(Lcombobox)) {
@@ -1522,30 +1520,24 @@
 }
 
 /* fenetre de confirmation avec une checkbox */
-GHashTable *create_dialog_confirm_operation (GtkWidget *Aparent,
+Tgrave *create_dialog_confirm_operation (GtkWidget *Aparent,
     gchar *Alabel, gchar *Acheckboxlbl, gboolean Acheckboxstatus)
 {
-  gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE 
"/dialog_confirm_operation.glade";
-  GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
+  Tgrave *Lg = sc_grave_load("dialog_confirm_operation.glade");
   GtkWidget *Ldialog;
-  GtkLabel *Llabel;
   GtkToggleButton *Ltoggleoption;
-  GHashTable *Lhash = _hash();
 
-  if (!Lxml) {
-    g_error("Cannot load '%s': %s\n", Ltemplate, g_strerror(errno));
-  }
+  g_assert(Lg);
 
-  Ldialog = glade_xml_get_widget(Lxml, "dialog_confirm_operation");
+  Ldialog = sc_grave_get_widget(Lg, "dialog_confirm_operation");
   gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
-  g_hash_table_insert(Lhash, "window", Ldialog);
+  sc_grave_set_data(Lg, Ldialog, "window");
 
   /* titre */
-  Llabel = GTK_LABEL(glade_to_hash(Lxml, Lhash, "label"));
-  gtk_label_set_text(Llabel, Alabel);
+  gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lg, "label")), Alabel);
   
   /* effacer les cdrw en mode fast ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "checkbox"));
+  Ltoggleoption = GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, "checkbox"));
   if (Acheckboxlbl) {
     gtk_toggle_button_set_active(Ltoggleoption, Acheckboxstatus);
     gtk_button_set_label(GTK_BUTTON(Ltoggleoption), Acheckboxlbl);
@@ -1553,83 +1545,64 @@
     gtk_widget_hide(GTK_WIDGET(Ltoggleoption));
   }
 
-  return Lhash;
+  return Lg;
 }
 
 /* fenetre selection d'une operation sur un dvd */
-GHashTable *create_dialog_select_dvdoperation (GtkWidget *Aparent)
+Tgrave *create_dialog_select_dvdoperation (GtkWidget *Aparent)
 {
-  gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE 
"/dialog_select_operation.glade";
-  GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
+  Tgrave *Lg = sc_grave_load("dialog_select_operation.glade");
   GtkWidget *Ldialog;
-  GHashTable *Lhash = _hash();
 
-  if (!Lxml) {
-    g_error("Cannot load '%s': %s\n", Ltemplate, g_strerror(errno));
-  }
+  g_assert(Lg);
 
-  Ldialog = glade_xml_get_widget(Lxml, "dialog_select_operation");
+  Ldialog = sc_grave_get_widget(Lg, "dialog_select_operation");
   gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
-  g_hash_table_insert(Lhash, "window", Ldialog);
+  sc_grave_set_data(Lg, Ldialog, "window");
 
-  /* titre */
-  glade_to_hash(Lxml, Lhash, "label");
-  
   /* commencer une session ou merger ? */
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, 
"burninitial")), TRUE);
-  glade_to_hash(Lxml, Lhash, "burnmerge");
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"burninitial")), TRUE);
 
-  return Lhash;
+  return Lg;
 }
+
 /* fenetre proprietes */
-GHashTable *create_dialog_proprietes (GtkWidget *Aparent)
+Tgrave *create_dialog_proprietes (GtkWidget *Aparent)
 {
-  gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE "/dialog_properties.glade";
-  GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
-  GtkToggleButton *Ltoggleoption;
-  GtkEntry *Ldirtmpvalue;
+  Tgrave *Lg = sc_grave_load("dialog_properties.glade");
   GtkTreeView *Ltreeview;
   GtkWidget *Ldialog;
   GtkButton *Lbtn;
-  GHashTable *Lhash = _hash();
 
-  if (!Lxml) {
-    g_error("Cannot load '%s': %s\n", Ltemplate, g_strerror(errno));
-  }
+  g_assert(Lg);
 
-  Ldialog = glade_xml_get_widget(Lxml, "dialog_properties");
+  Ldialog = sc_grave_get_widget(Lg, "dialog_properties");
   gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
-  g_hash_table_insert(Lhash, "window", Ldialog);
+  sc_grave_set_data(Lg, Ldialog, "window");
 
   /** onglet "General" **/
   
   /* overburn actif ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "overburn"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("overburn"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"overburn")), conf_get_boolean("overburn"));
 
   /* effacer les cdrw avant ecriture */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "autoblank"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("autoblank"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"autoblank")), conf_get_boolean("autoblank"));
 
   /* effacer les cdrw en mode fast ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "fastblank"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("fastblank"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"fastblank")), conf_get_boolean("fastblank"));
 
   /* ejecter le cdr apres l'operation ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "eject"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("eject"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"eject")), conf_get_boolean("eject"));
 
   /* afficher le status bar ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "statusbar"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("statusbar"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"statusbar")), conf_get_boolean("statusbar"));
   
   /* combo taille des icones */
-  remplirecombo(GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "iconsizelist")), "", 
+  remplirecombo(GTK_COMBO_BOX(sc_grave_get_widget(Lg, "iconsizelist")), "", 
       Gtypeicosize, TRUE, conf_get_string("iconsize"));
 
   /* sauver les donnees lorsque l'on quitte ? */
-  Ltoggleoption = GTK_TOGGLE_BUTTON(glade_to_hash(Lxml, Lhash, "saveconfig"));
-  gtk_toggle_button_set_active(Ltoggleoption, conf_get_boolean("saveconfig"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Lg, 
"saveconfig")), conf_get_boolean("saveconfig"));
 
   /* fonctions etendues ? */
 #if 0  
@@ -1638,8 +1611,7 @@
 #endif
 
   /* repertoire temporraire */
-  Ldirtmpvalue = GTK_ENTRY(glade_to_hash(Lxml, Lhash, "dirtmpvalue"));
-  gtk_entry_set_text(Ldirtmpvalue, conf_get_string("tmpdir"));
+  gtk_entry_set_text(GTK_ENTRY(sc_grave_get_widget(Lg, "dirtmpvalue")), 
conf_get_string("tmpdir"));
 
   /** onglet "Format des medias" **/
 #if 0
@@ -1652,67 +1624,50 @@
 #endif
 
 
-  /** 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);
-  glade_to_hash_list(Lxml, Lhash, "growisofs", "growisofslbl", 
"growisofspara", NULL);
-  glade_to_hash_list(Lxml, Lhash, "dvd+rw-mediainfo", "dvd+rw-mediainfolbl", 
"dvd+rw-mediainfopara", NULL);
-  glade_to_hash_list(Lxml, Lhash, "dvd+rw-format", "dvd+rw-formatlbl", 
"dvd+rw-formatpara", NULL);
-  glade_to_hash(Lxml, Lhash, "popupdevices");
-
-  /** onglet "Lecteurs" **/
-  Ltreeview = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "periphdata"));
+  Ltreeview = GTK_TREE_VIEW(sc_grave_get_widget(Lg, "periphdata"));
   prepare_properties_devicestreeview(Ltreeview);
-  g_signal_connect(G_OBJECT(Ltreeview), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lhash);
-  g_signal_connect(G_OBJECT(Ltreeview), "popup-menu", 
G_CALLBACK(key_popupmenu_devices), Lhash);
+  g_signal_connect(G_OBJECT(Ltreeview), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lg);
+  g_signal_connect(G_OBJECT(Ltreeview), "popup-menu", 
G_CALLBACK(key_popupmenu_devices), Lg);
 
   /* popup sur les peripheriques */
-  g_signal_connect(G_OBJECT(glade_to_hash(Lxml, Lhash, "popupdevices_edit")),
-      "activate", G_CALLBACK(gtk_devices_edit), Lhash);
-  g_signal_connect(G_OBJECT(glade_to_hash(Lxml, Lhash, "popupdevices_remove")),
-      "activate", G_CALLBACK(gtk_devices_remove), Lhash);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "popupdevices_edit")),
+      "activate", G_CALLBACK(gtk_devices_edit), Lg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "popupdevices_remove")),
+      "activate", G_CALLBACK(gtk_devices_remove), Lg);
 
-  g_hash_table_insert(Lhash, "topwindow", Aparent);
+  sc_grave_set_data(Lg, Aparent, "topwindow");
   
-  maj_proprietes_prog(Lhash);
+  maj_proprietes_prog(Lg);
   remplirelistegraveur(Ltreeview);
 
-  Lbtn = GTK_BUTTON(glade_xml_get_widget(Lxml, "dirtmp"));
-  g_signal_connect(G_OBJECT(Lbtn), "clicked", G_CALLBACK(gtk_file_sel), Lhash);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "dirtmp")), "clicked", 
G_CALLBACK(gtk_file_sel), Lg);
 
-  Lbtn = GTK_BUTTON(glade_xml_get_widget(Lxml, "scanprog"));
-  g_signal_connect(G_OBJECT(Lbtn), "clicked", G_CALLBACK(chercheprog), Lhash);
+  Lbtn = GTK_BUTTON(sc_grave_get_widget(Lg, "scanprog"));
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "scanprog")), "clicked", 
G_CALLBACK(chercheprog), Lg);
 
-  Lbtn = GTK_BUTTON(glade_xml_get_widget(Lxml, "scandevice"));
-  g_signal_connect(G_OBJECT(Lbtn), "clicked", G_CALLBACK(cherchelecteur), 
Lhash);
+  Lbtn = GTK_BUTTON(sc_grave_get_widget(Lg, "scandevice"));
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "scandevice")), "clicked", 
G_CALLBACK(cherchelecteur), Lg);
 
-  Lbtn = GTK_BUTTON(glade_to_hash(Lxml, Lhash, "adddevice"));
-  g_signal_connect(G_OBJECT(Lbtn), "clicked", G_CALLBACK(gtk_devices_add), 
Lhash);
+  Lbtn = GTK_BUTTON(sc_grave_get_widget(Lg, "adddevice"));
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "adddevice")), "clicked", 
G_CALLBACK(gtk_devices_add), Lg);
   
  
-  return Lhash;
+  return Lg;
 }
 
 /* premiere utilisation de graveman, bienvenue ! */
 void welcome_to_graveman(void)
 {
-  gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE "/dialog_welcome.glade";
-  GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
+  Tgrave *Lg = sc_grave_load("dialog_welcome.glade");
   GtkWidget *Ldialog;
 
-  if (!Lxml) {
-    g_error("Cannot load '%s': %s\n", Ltemplate, g_strerror(errno));
-  }
+  g_assert(Lg);
 
-  Ldialog = glade_xml_get_widget(Lxml, "dialog_welcome"); 
+  Ldialog = sc_grave_get_widget(Lg, "dialog_welcome"); 
 
   gtk_dialog_run(GTK_DIALOG(Ldialog));
   gtk_widget_destroy(Ldialog);
-
-  g_free(Lxml);
+  sc_grave_destroy(Lg);
 }
 
 /* mise a jour d'une bar indicant le remplissage, passage en rouge si le cd 
est plein */
@@ -1742,48 +1697,39 @@
 }
 
 /* effacer un cd reinscriptible */
-void show_erasecdrwwindow(GHashTable *Ahash)
+void show_erasecdrwwindow(Tgrave *Ag)
 {
-  GtkWidget *Lwindow1 = g_hash_table_lookup(Ahash, "window");
-  GladeXML *Lxmlencours = create_window_encours(Lwindow1);
+  GtkWidget *Lwindow1 = sc_grave_get_data(Ag, "window");
+  Tgrave *Lerasecdg = create_window_encours(Lwindow1);
   gint Lcont = 2;
   gint Lpid;
   gboolean Loperationstatus = FALSE;
   gboolean Labort = FALSE;
-  GtkWidget *Lprogressbar;
-  GtkLabel *Llabel;
-  GtkWidget *Lcancel;
   GtkWidget *Lwin;
-  GHashTable *Lerasecdhash = _hash();
   GError *Lerror = NULL;
   GtkWidget *Lstatusbox = NULL;
 
-  Lwin = glade_xml_get_widget(Lxmlencours, "window_inprogress"); 
-  Llabel = GTK_LABEL(glade_xml_get_widget(Lxmlencours, "labelava"));
-  gtk_label_set_text(Llabel, _("Erasing CD-RW in progress, please wait..."));
+  Lwin = sc_grave_get_widget(Lerasecdg, "window_inprogress"); 
+  gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lerasecdg, "labelava")), 
_("Erasing CD-RW in progress, please wait..."));
 
   
-  Lprogressbar = glade_xml_get_widget(Lxmlencours, "progress");
-  g_hash_table_insert(Lerasecdhash, "cont", &Lcont);
-  g_hash_table_insert(Lerasecdhash, "pid", &Lpid);
-  g_hash_table_insert(Lerasecdhash, "gabort", &Labort);
-  g_hash_table_insert(Lerasecdhash, "gerror", &Lerror);
-  g_hash_table_insert(Lerasecdhash, "operationstatus", &Loperationstatus);
-  g_hash_table_insert(Lerasecdhash, "labelava", Llabel);
-  g_hash_table_insert(Lerasecdhash, "progress", Lprogressbar);
-  g_hash_table_insert(Lerasecdhash, "dstothercombo", 
g_hash_table_lookup(Ahash, "dstothercombo"));
-  g_hash_table_insert(Lerasecdhash, "usefastblank", g_hash_table_lookup(Ahash, 
"usefastblank"));
+  sc_grave_set_data(Lerasecdg, &Lcont, "cont");
+  sc_grave_set_data(Lerasecdg, &Lpid, "pid");
+  sc_grave_set_data(Lerasecdg, &Labort, "gabort");
+  sc_grave_set_data(Lerasecdg, &Lerror, "gerror");
+  sc_grave_set_data(Lerasecdg, &Loperationstatus, "operationstatus");
+  sc_grave_set_data(Lerasecdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
+  sc_grave_set_data(Lerasecdg, sc_grave_get_widget(Ag, "usefastblank"), 
"usefastblank");
 
   /* bouton annuler */
-  Lcancel = glade_xml_get_widget(Lxmlencours, "cancelbtn");
-  g_signal_connect(G_OBJECT(Lcancel), "clicked", G_CALLBACK(abort_encours), 
Lerasecdhash);
-  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lerasecdhash);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lerasecdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lerasecdg);
+  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lerasecdg);
 
   gtk_widget_show(Lwin);
-  g_timeout_add(500, encours_callback, Lerasecdhash);
+  g_timeout_add(500, encours_callback, Lerasecdg);
 
   /* operation en elle meme */
-  perform_erase_cdrw(Lerasecdhash, &Lerror);
+  perform_erase_cdrw(Lerasecdg, &Lerror);
   
   if (Labort) {
     Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwin),
@@ -1802,7 +1748,7 @@
   gtk_widget_destroy(Lstatusbox);
   
   gtk_widget_destroy(Lwin);
-  g_hash_table_destroy(Lerasecdhash);
+  sc_grave_destroy(Lerasecdg);
 
   if (Lerror) g_error_free(Lerror);
 }
@@ -1816,39 +1762,29 @@
   gint Lpid;
   gboolean Loperationstatus = FALSE;
   gboolean Labort = FALSE;
-  GtkWidget *Lprogressbar;
-  GtkLabel *Llabel;
-  GtkWidget *Lcancel;
   GtkWidget *Lwin;
-  GHashTable *Lfixcdhash = _hash();
   GError *Lerror = NULL;
   GtkWidget *Lstatusbox = NULL;
 
-  Lwin = glade_xml_get_widget(Lxmlencours, "window_inprogress"); 
-  Llabel = GTK_LABEL(glade_xml_get_widget(Lxmlencours, "labelava"));
-  gtk_label_set_text(Llabel, _("Fixating CD-R in progress, please wait..."));
-
+  Lwin = sc_grave_get_widget(Lfixcdg, "window_inprogress"); 
+  gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lfixcdg, "labelava")), 
_("Fixating CD-R in progress, please wait..."));
   
-  Lprogressbar = glade_xml_get_widget(Lxmlencours, "progress");
-  g_hash_table_insert(Lfixcdhash, "cont", &Lcont);
-  g_hash_table_insert(Lfixcdhash, "pid", &Lpid);
-  g_hash_table_insert(Lfixcdhash, "gabort", &Labort);
-  g_hash_table_insert(Lfixcdhash, "gerror", &Lerror);
-  g_hash_table_insert(Lfixcdhash, "operationstatus", &Loperationstatus);
-  g_hash_table_insert(Lfixcdhash, "labelava", Llabel);
-  g_hash_table_insert(Lfixcdhash, "progress", Lprogressbar);
-  g_hash_table_insert(Lfixcdhash, "dstothercombo", g_hash_table_lookup(Ahash, 
"dstothercombo"));
+  sc_grave_set_data(Lfixcdg, &Lcont, "cont");
+  sc_grave_set_data(Lfixcdg, &Lpid, "pid");
+  sc_grave_set_data(Lfixcdg, &Labort, "gabort");
+  sc_grave_set_data(Lfixcdg, &Lerror, "gerror");
+  sc_grave_set_data(Lfixcdg, &Loperationstatus, "operationstatus");
+  sc_grave_set_data(Lfixcdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
 
   /* bouton annuler */
-  Lcancel = glade_xml_get_widget(Lxmlencours, "cancelbtn");
-  g_signal_connect(G_OBJECT(Lcancel), "clicked", G_CALLBACK(abort_encours), 
Lfixcdhash);
-  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lfixcdhash);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lfixcdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lfixcdg);
+  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lfixcdg);
 
   gtk_widget_show(Lwin);
-  g_timeout_add(500, encours_callback, Lfixcdhash);
+  g_timeout_add(500, encours_callback, Lfixcdg);
 
   /* operation en elle meme */
-  perform_fix_cd(Lfixcdhash, &Lerror);
+  perform_fix_cd(Lfixcdg, &Lerror);
   
   if (Labort) {
     Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwin),
@@ -1867,7 +1803,7 @@
   gtk_widget_destroy(Lstatusbox);
   
   gtk_widget_destroy(Lwin);
-  g_hash_table_destroy(Lfixcdhash);
+  sc_grave_destroy(Lfixcdg);
 
   if (Lerror) g_error_free(Lerror);
 }
@@ -1881,9 +1817,7 @@
   gint Lpid;
   gboolean Loperationstatus = FALSE;
   gboolean Labort = FALSE;
-  GtkWidget *Lprogressbar;
   GtkLabel *Llabel;
-  GtkWidget *Lcancel;
   GtkWidget *Lwin;
   GError *Lerror = NULL;
   GtkWidget *Lstatusbox = NULL;
@@ -1898,7 +1832,7 @@
   sc_grave_set_data(Lformatdvdg, &Labort, "gabort");
   sc_grave_set_data(Lformatdvdg, &Lerror, "gerror");
   sc_grave_set_data(Lformatdvdg, &Loperationstatus, "operationstatus");
-  sc_grave_set_widget(Lformatdvdg, "dstothercombo", sc_grave_get_widget(Ag, 
"dstothercombo"));
+  sc_grave_set_data(Lformatdvdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
 
   /* bouton annuler */
   g_signal_connect(G_OBJECT(sc_grave_get_widget(Lformatdvdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lformatdvdg);