[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.20 graveman/current/src/config.c:1.21
--- graveman/current/src/config.c:1.20  Sun Feb 27 03:34:11 2005
+++ graveman/current/src/config.c       Sun Feb 27 15:45:42 2005
@@ -48,10 +48,13 @@
   { CONF_STRING, "growisofspara", "", CONF_SAVEALWAYS },
   { CONF_PROG, "cdrdao", "", CONF_SAVEALWAYS },
   { CONF_STRING, "cdrdaopara", "", CONF_SAVEALWAYS },
+  { CONF_PROG, "flac", "", CONF_SAVEALWAYS },
+  { CONF_STRING, "flacpara", "", CONF_SAVEALWAYS },
   { CONF_DIR, "tmpdir", "/tmp", CONF_SAVEALWAYS },
   { CONF_STRING, "overburn", "1", CONF_SAVEALWAYS },
   { CONF_STRING, "autoblank", "1", CONF_SAVEALWAYS },
   { CONF_STRING, "fastblank", "1", CONF_SAVEALWAYS },
+  { CONF_STRING, "charsetdata", "", CONF_SAVEALWAYS },
   { CONF_STRING, "eject", "1", CONF_SAVEALWAYS },
   { CONF_STRING, "iconsize", "24", CONF_SAVEALWAYS },
   { CONF_STRING, "statusbar", "1", CONF_SAVEALWAYS },
@@ -415,18 +418,27 @@
     manage_saveonexit_value(Ag);
   }
 
-  if (Aop & SEARCH_PROG) {
-    /* on recherche les programmes externes */
+  if (Aop & CONF_INIT_DEFAULT) {
+    /* initialsiation des valeurs par defaut */
     for (Lcurprog = Glisteprogrequis; Lcurprog->entry; Lcurprog++) {
-      if (Lcurprog->type & CONF_PROG) {
-        Lprog = g_find_program_in_path(Lcurprog->entry);
-      } else {
+      if (Lcurprog->defaultvalue && *Lcurprog->defaultvalue) {
         Lprog = g_strdup(Lcurprog->defaultvalue);
+
+        conf_store_value(Lcurprog->entry, Lprog);
       }
+    }
+  }
+
+  if (Aop & SEARCH_PROG) {
+    /* on recherche les programmes externes */
+    for (Lcurprog = Glisteprogrequis; Lcurprog->entry; Lcurprog++) {
+      if (Lcurprog->type &~ CONF_PROG) continue;
+
+      Lprog = g_find_program_in_path(Lcurprog->entry);
 
       conf_store_value(Lcurprog->entry, Lprog);
 #ifdef DEBUG
-      if (! Lprog) g_warning("ERREUR LE PROG [%s] EST INDISPENSABLE ET NON 
TROUVE !\n", Lcurprog->entry);
+      if (! Lprog || !*Lprog) g_warning("ERREUR LE PROG [%s] EST INDISPENSABLE 
ET NON TROUVE !\n", Lcurprog->entry);
 #endif
     }
     
@@ -542,6 +554,7 @@
     
   Llignes = g_strsplit((const gchar *) Lcontents, "\n", 200);
 
+printf("toutdebut\n");
   for (i=0; Llignes[i]; i++) {
     Luneligne = (gchar *)Llignes[i];
     g_strstrip(Luneligne);
@@ -550,6 +563,7 @@
 
     if (*Luneligne == '[') {
       if (Ldriveinfo) { /* ajout d'un lecteur si un en cours */
+printf("hum ?\n");        
         append_this_drive(Ldriveinfo);
         Ldriveinfo = NULL;
       }
@@ -559,6 +573,7 @@
       if (!strcmp(Lemplacement, "[media]")) { /* init media */
         Lmedialen = 0; *Lmedialabeldata = *Lmedialabelaudio = 0;
       } else if (!strcmp(Lemplacement, "[lecteur]")) {  /* init lecteur */
+printf("oui un lecteur\n");        
         Ldriveinfo = g_malloc0(sizeof(Tdriveinfo));
       }
     } else if (!strcmp(Lemplacement, "[general]")) {
@@ -653,14 +668,17 @@
 {
   Tgrave *Lg = (Tgrave *) Adata;
   GtkWidget *Lobj = sc_grave_get_widget(Lg, Akey);
-  gchar *Lname;
+  gchar *Lname, *Lconfvalue;
   GtkEntry *Lobjentry;
   GtkWidget *Lobjlbl;
+  
+  if (!GTK_IS_WIDGET(Lobj)) return;
 
-  if (!Lobj) return;
   Lname = g_strdup_printf("%s%s", gtk_widget_get_name(Lobj), "para");
   Lobjentry = GTK_ENTRY(sc_grave_get_widget(Lg, Lname));
-  gtk_entry_set_text(Lobjentry, *(gchar *)conf_get_string(Lname) ? 
conf_get_string(Lname) : "");
+
+  Lconfvalue = conf_get_string(Lname);
+  gtk_entry_set_text(Lobjentry, Lconfvalue ? Lconfvalue : "");
   g_free(Lname);
 
   Lname = g_strdup_printf("%s%s", gtk_widget_get_name(Lobj), "lbl");
@@ -678,6 +696,7 @@
   }
 }
 
+/* mise a jour de la page "programme externe" */
 void maj_proprietes_prog(Tgrave *Ag)
 {
   TProgRequis *Lcurentry;