[monkey-bubble: 124/753] Use gnome_program_locate_file() instead of gnome_config_file().

[Sven Herzberg <herzi src gnome org>]

commit f2935a083079748038f245aa2a688afd4cab2ecf
Author: Martin Baulig <baulig suse de>
Date:   Wed Apr 11 18:18:00 2001 +0000

    Use gnome_program_locate_file() instead of gnome_config_file().
    
    2001-04-11  Martin Baulig  <baulig suse de>
    
    	* gnome-config.c (access_config_extended): Use
    	gnome_program_locate_file() instead of gnome_config_file().
    
    	* gnome-fileconvert.c (gfc_read_FileConverters): Use
    	gnome_program_locate_file().

 libgnome/ChangeLog           |    8 ++++++++
 libgnome/gnome-config.c      |   10 +++++++---
 libgnome/gnome-fileconvert.c |    4 +++-
 3 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index fca5626..724a93d 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,5 +1,13 @@
 2001-04-11  Martin Baulig  <baulig suse de>
 
+	* gnome-config.c (access_config_extended): Use
+	gnome_program_locate_file() instead of gnome_config_file().
+
+	* gnome-fileconvert.c (gfc_read_FileConverters): Use
+	gnome_program_locate_file().
+
+2001-04-11  Martin Baulig  <baulig suse de>
+
 	* gnome-program.c (gnome_program_locate_file): Return NULL if
 	`ret_locations' is given.
 
diff --git a/libgnome/gnome-config.c b/libgnome/gnome-config.c
index e97ead6..8ea14b5 100644
--- a/libgnome/gnome-config.c
+++ b/libgnome/gnome-config.c
@@ -562,7 +562,9 @@ access_config_extended (access_type mode, const char *section_name,
 				g_free (cache_overrride_filename);
 
  			tmp = g_concat_dir_and_file ("gnome/config-override",rel_file);
- 			filename = gnome_config_file (tmp);
+ 			filename = gnome_program_locate_file
+			    (gnome_program_get (), GNOME_FILE_DOMAIN_CONFIG,
+			     tmp, TRUE, NULL);
  			g_free (tmp);
  			cache_overrride_filename = filename ? g_strdup (filename) : NULL;
 			
@@ -570,8 +572,10 @@ access_config_extended (access_type mode, const char *section_name,
 				g_free (cache_global_filename);
 
 			tmp = g_concat_dir_and_file ("gnome/config", rel_file);
-			filename = gnome_config_file (tmp);
-			g_free (tmp);
+ 			filename = gnome_program_locate_file
+			    (gnome_program_get (), GNOME_FILE_DOMAIN_CONFIG,
+			     tmp, TRUE, NULL);
+ 			g_free (tmp);
 			cache_global_filename = filename ? g_strdup (filename) : NULL;
  		}
 
diff --git a/libgnome/gnome-fileconvert.c b/libgnome/gnome-fileconvert.c
index ce253f8..c304990 100644
--- a/libgnome/gnome-fileconvert.c
+++ b/libgnome/gnome-fileconvert.c
@@ -193,7 +193,9 @@ gfc_read_FileConverters(void)
 	
 	file_types = g_hash_table_new(g_str_hash, g_str_equal);
 	
-	dirname = gnome_unconditional_datadir_file ("type-convert");
+	dirname = gnome_program_locate_file (gnome_program_get (),
+					     GNOME_FILE_DOMAIN_DATADIR,
+					     "type-convert", FALSE, NULL);
 
 	dir = opendir (dirname);
 	if (dir){