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

[sylvain cresto]

Index: graveman/current/src/config.c
diff -u graveman/current/src/config.c:1.16 graveman/current/src/config.c:1.17
--- graveman/current/src/config.c:1.16  Sat Feb 12 16:41:07 2005
+++ graveman/current/src/config.c       Sat Feb 19 17:49:08 2005
@@ -171,8 +171,6 @@
   fprintf(Lfic, "[general]\n");
   fprintf(Lfic, "confversion=%s\n", VERSION);
   g_hash_table_foreach(Gconfigprog, foreachconfig, (gpointer *)(Lfic));
-
-/*  g_slist_foreach(Gmedialist, foreachmedia, (gpointer *)(fic)); */
   
   /* ecriture des lecteurs */
 
@@ -354,14 +352,14 @@
 
 /* savegarde de la valeur de certains champs du formulaire lorsque
  * l'option "save on exit" est active */
-void manage_saveonexit_value(GHashTable *Ahash)
+void manage_saveonexit_value(Tgrave *Ag)
 {
   TProgRequis *Lcurentry;
   GtkWidget *Lwidget;
 
   for (Lcurentry = Glisteprogrequis; Lcurentry->entry; Lcurentry++) {
     if (!(Lcurentry->level & CONF_SAVEONEXIT)) continue;
-    Lwidget = g_hash_table_lookup(Ahash, Lcurentry->entry);
+    Lwidget = sc_grave_get_widget(Ag, Lcurentry->entry);
 
     if (!GTK_IS_WIDGET(Lwidget)) {
       g_warning("Error %s is missing!", Lcurentry->entry);
@@ -380,16 +378,15 @@
 }
 
 /* gestion de la configuration (creation/chargement/sauvegarde...) */
-gboolean manage_config(GHashTable *Ahash, gshort Aop, GError **Aerror)
+gboolean manage_config(Tgrave *Ag, gshort Aop, GError **Aerror)
 {
   TProgRequis *Lcurprog;
   gchar *Lprog;
-  GtkWidget *Lwindow1;
-  Lwindow1 = g_hash_table_lookup(Ahash, "topwindow");
+  GtkWidget *Lwindow1 = sc_grave_get_widget(Ag, "topwindow");
 
   if (Aop & UPDATE_SAVEONEXIT_VALUE) {
     /* mise a jour des valeurs a sauvegarder lorsque l'on quitte */
-    manage_saveonexit_value(Ahash);
+    manage_saveonexit_value(Ag);
   }
 
   if (Aop & SEARCH_PROG) {
@@ -419,7 +416,7 @@
 
   if (Aop & SEARCH_LECTEUR) {
     /* maintenant scan des lecteurs */
-    cherchelecteur(NULL, Ahash);
+    cherchelecteur(NULL, Ag);
   }
 
   if (Aop & UPDATE_SIZE && GTK_IS_WIDGET(Lwindow1)) {
@@ -606,20 +603,20 @@
 
 void maj_foreach_prog(gpointer Akey, gpointer Avalue, gpointer Adata)
 {
-  GHashTable *Lhash = (GHashTable *) Adata;
-  GtkWidget *Lobj = g_hash_table_lookup(Lhash, Akey);
+  Tgrave *Lg = (Tgrave *) Adata;
+  GtkWidget *Lobj = sc_grave_get_widget(Lg, Akey);
   gchar *Lname;
   GtkEntry *Lobjentry;
   GtkWidget *Lobjlbl;
 
   if (!Lobj) return;
   Lname = g_strdup_printf("%s%s", gtk_widget_get_name(Lobj), "para");
-  Lobjentry = GTK_ENTRY(g_hash_table_lookup(Lhash, Lname));
+  Lobjentry = GTK_ENTRY(sc_grave_get_widget(Lg, Lname));
   gtk_entry_set_text(Lobjentry, *(gchar *)conf_get_string(Lname) ? 
conf_get_string(Lname) : "");
   g_free(Lname);
 
   Lname = g_strdup_printf("%s%s", gtk_widget_get_name(Lobj), "lbl");
-  Lobjlbl = g_hash_table_lookup(Lhash, Lname);
+  Lobjlbl = sc_grave_get_widget(Lg, Lname);
   g_free(Lname);
       
   if (*(gchar *)Avalue) {
@@ -633,7 +630,7 @@
   }
 }
 
-void maj_proprietes_prog(GHashTable *Ahash)
+void maj_proprietes_prog(Tgrave *Ag)
 {
   TProgRequis *Lcurentry;
   gchar *Lvalue;
@@ -641,7 +638,7 @@
   for (Lcurentry = Glisteprogrequis; Lcurentry->entry; Lcurentry++) {
     if (Lcurentry->type == CONF_PROG) {
       Lvalue = conf_get_string(Lcurentry->entry);
-      maj_foreach_prog(Lcurentry->entry, Lvalue, Ahash);
+      maj_foreach_prog(Lcurentry->entry, Lvalue, Ag);
     }
   }
 }
@@ -661,7 +658,7 @@
 }
 
 /* on restaure les dernieres valeurs utilisees pour certains champs */
-void restore_last_used_values(GHashTable *Ahash)
+void restore_last_used_values(Tgrave *Ag)
 {
   TProgRequis *Lcurentry;
   GtkWidget *Lwidget;
@@ -670,7 +667,7 @@
     if (!(Lcurentry->level & CONF_SAVEONEXIT)) continue;
 
     if ((Lcurentry->level & CONF_SPIN) || (Lcurentry->level & CONF_CHECK)) {
-      Lwidget = g_hash_table_lookup(Ahash, Lcurentry->entry);
+      Lwidget = sc_grave_get_widget(Ag, Lcurentry->entry);
       if (!GTK_IS_WIDGET(Lwidget)) {
         g_warning("Error %s is missing!", Lcurentry->entry);
         continue;