[gaim-migrate @ 18131]

A few more path-pref fixes.

3 files changed, 11 insertions, 11 deletions

diff --git a/gtk/gtkprefs.c b/gtk/gtkprefs.c
index 52af31dbeb..8b79560d40 100644
--- a/gtk/gtkprefs.c
+++ b/gtk/gtkprefs.c
@@ -1375,7 +1375,7 @@ logging_page()
 #ifndef _WIN32
 static gint sound_cmd_yeah(GtkEntry *entry, gpointer d)
 {
-	gaim_prefs_set_string("/gaim/gtk/sound/command",
+	gaim_prefs_set_path("/gaim/gtk/sound/command",
 			gtk_entry_get_text(GTK_ENTRY(entry)));
 	return TRUE;
 }
@@ -1619,7 +1619,7 @@ sound_page()
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 
 	gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
-	cmd = gaim_prefs_get_string("/gaim/gtk/sound/command");
+	cmd = gaim_prefs_get_path("/gaim/gtk/sound/command");
 	if(cmd)
 		gtk_entry_set_text(GTK_ENTRY(entry), cmd);
 
diff --git a/gtk/gtksound.c b/gtk/gtksound.c
index 49db0aa6e0..1ae0a7e148 100644
--- a/gtk/gtksound.c
+++ b/gtk/gtksound.c
@@ -527,7 +527,7 @@ gaim_gtk_sound_play_event(GaimSoundEventID event)
 
 	/* check NULL for sounds that don't have an option, ie buddy pounce */
 	if (gaim_prefs_get_bool(enable_pref)) {
-		char *filename = g_strdup(gaim_prefs_get_string(file_pref));
+		char *filename = g_strdup(gaim_prefs_get_path(file_pref));
 		if(!filename || !strlen(filename)) {
 			g_free(filename);
 			filename = g_build_filename(DATADIR, "sounds", "gaim", sounds[event].def, NULL);
diff --git a/libgaim/prefs.c b/libgaim/prefs.c
index 36bc0cf4d1..882882f628 100644
--- a/libgaim/prefs.c
+++ b/libgaim/prefs.c
@@ -900,9 +900,9 @@ gaim_prefs_set_path(const char *name, const char *value)
 	struct gaim_pref *pref = find_pref(name);
 
 	if(pref) {
-		if(pref->type != GAIM_PREF_STRING) {
+		if(pref->type != GAIM_PREF_PATH) {
 			gaim_debug_error("prefs",
-					"gaim_prefs_set_string: %s not a string pref\n", name);
+					"gaim_prefs_set_path: %s not a string pref\n", name);
 			return;
 		}
 
@@ -926,9 +926,9 @@ gaim_prefs_set_path_list(const char *name, GList *value)
 	if(pref) {
 		GList *tmp;
 
-		if(pref->type != GAIM_PREF_STRING_LIST) {
+		if(pref->type != GAIM_PREF_PATH_LIST) {
 			gaim_debug_error("prefs",
-					"gaim_prefs_set_string_list: %s not a string list pref\n",
+					"gaim_prefs_set_path_list: %s not a string list pref\n",
 					name);
 			return;
 		}
@@ -1056,11 +1056,11 @@ gaim_prefs_get_path(const char *name)
 
 	if(!pref) {
 		gaim_debug_error("prefs",
-				"gaim_prefs_get_string: Unknown pref %s\n", name);
+				"gaim_prefs_get_path: Unknown pref %s\n", name);
 		return NULL;
 	} else if(pref->type != GAIM_PREF_PATH) {
 		gaim_debug_error("prefs",
-				"gaim_prefs_get_string: %s not a path pref\n", name);
+				"gaim_prefs_get_path: %s not a path pref\n", name);
 		return NULL;
 	}
 
@@ -1075,11 +1075,11 @@ gaim_prefs_get_path_list(const char *name)
 
 	if(!pref) {
 		gaim_debug_error("prefs",
-				"gaim_prefs_get_string_list: Unknown pref %s\n", name);
+				"gaim_prefs_get_path_list: Unknown pref %s\n", name);
 		return NULL;
 	} else if(pref->type != GAIM_PREF_PATH_LIST) {
 		gaim_debug_error("prefs",
-				"gaim_prefs_get_string_list: %s not a path list pref\n", name);
+				"gaim_prefs_get_path_list: %s not a path list pref\n", name);
 		return NULL;
 	}