[gtpd-cvs] gtkpod/src prefs.c,1.187,1.188

[<fre...@us...>]

Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17239/src

Modified Files:
	prefs.c 
Log Message:

Clean up dead path keys in cleanup_keys


Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- prefs.c	31 May 2006 21:49:53 -0000	1.187
+++ prefs.c	31 May 2006 22:05:58 -0000	1.188
@@ -738,7 +738,31 @@
   
   if (prefs_get_string_value_index("toolpath", PATH_NUM, NULL))
     prefs_set_string_index("toolpath", PATH_NUM, NULL);
-
+  
+  /* Ignore play_now_path */
+  if (prefs_get_string_value("play_now_path", NULL))
+    prefs_set_string("play_now_path", NULL);
+  
+  /* Ignore sync_remove */
+  if (prefs_get_string_value("sync_remove", NULL))
+    prefs_set_string("sync_remove", NULL);
+  
+  /* Ignore sync_remove_confirm */
+  if (prefs_get_string_value("sync_remove_confirm", NULL))
+    prefs_set_string("sync_remove_confirm", NULL);
+  
+  /* Ignore show_sync_dirs */
+  if (prefs_get_string_value("show_sync_dirs", NULL))
+    prefs_set_string("show_sync_dirs", NULL);
+  
+  /* Ignore play_enqueue_path */
+  if (prefs_get_string_value("play_enqueue_path", NULL))
+    prefs_set_string("play_enqueue_path", NULL);
+  
+  /* Ignore mp3gain_path */
+  if (prefs_get_string_value("mp3gain_path", NULL))
+    prefs_set_string("mp3gain_path", NULL);
+  
   prefs_set_string ("version", VERSION);
 }
 
@@ -1795,30 +1819,6 @@
 	      cfg->version = g_ascii_strtod (arg, NULL);
 	      prefs_set_string ("version", arg);
 	  }
-	  else if(g_ascii_strcasecmp (line, "play_now_path") == 0)
-	  {
-	      /* ignore */
-	  }
-	  else if(g_ascii_strcasecmp (line, "sync_remove") == 0)
-	  {
-	      /* ignore */
-	  }
-	  else if(g_ascii_strcasecmp (line, "sync_remove_confirm") == 0)
-	  {
-	      /* ignore */
-	  }
-	  else if(g_ascii_strcasecmp (line, "show_sync_dirs") == 0)
-	  {
-	      /* ignore */
-	  }
-	  else if(g_ascii_strcasecmp (line, "play_enqueue_path") == 0)
-	  {
-	      /* ignore */
-	  }
-	  else if(g_ascii_strcasecmp (line, "mp3gain_path") == 0)
-	  {
-	      /* ignore */
-	  }
 	  else if(g_ascii_strcasecmp (line, "time_format") == 0)
 	  {
 	      /* removed in 0.87 */