force section and key names to not have spaces. Fixes problems in the configurator

src/conf.c

@@ -462,6 +462,7 @@ int conf_read(char *file) {
     int key_type;
     char **valuearray;
     int index;
+    char *temp;
 
     if(conf_main_file) {
         conf_close();
@@ -513,6 +514,15 @@ int conf_read(char *file) {
             compat_mode=0;
             term=&linebuffer[1];
             value = strchr(term,']');
+
+            /* convert spaces to underscores in headings */
+            temp = term;
+            while(*temp) {
+                if(*temp == ' ')
+                    *temp = '_';
+                temp++;
+            }
+
             if(!value) {
                 ll_destroy(pllnew);
                 fclose(fin);
@@ -574,6 +584,14 @@ int conf_read(char *file) {
                 while((strlen(value) && (strchr("\t ",value[strlen(value)-1]))))
                       value[strlen(value)-1] = '\0';
 
+                /* convert spaces to underscores in key */
+                temp = term;
+                while(*temp) {
+                    if(*temp == ' ')
+                        *temp = '_';
+                    temp++;
+                }
+
                 if(!pllcurrent) {
                     /* in compat mode -- add a general section */
                     if((err=ll_create(&plltemp)) != LL_E_SUCCESS) {

src/mp3-scanner.c

@@ -210,7 +210,7 @@ void scan_process_playlistlist(void) {
         }
 
         if(strcasecmp(ext,".xml") == 0) {
-            if(conf_get_int("scanning","process xml",1)) {
+            if(conf_get_int("scanning","process_xml",1)) {
                 DPRINTF(E_LOG,L_SCAN,"Scanning %s\n",pnext->path);
                 scan_xml_playlist(pnext->path);
             }
@@ -772,7 +772,7 @@ void make_composite_tags(MP3FILE *song) {
     }
 
     if(song->compilation && song->artist && song->title &&
-       (conf_get_int("scanning","concat compilations",0))) {
+       (conf_get_int("scanning","concat_compilations",0))) {
         len = (int)strlen(song->artist) +
               (int)strlen(sep) +
               (int)strlen(song->title);