# HG changeset patch # User Sadrul Habib Chowdhury # Date 1168889090 0 # Node ID 412c2b3b5fc0cb782f3297d05adaf674732e5804 # Parent 315be2f86cb9e30e42f97c03ce3e0f8ecf096fb4 [gaim-migrate @ 18131] A few more path-pref fixes. committer: Tailor Script diff -r 315be2f86cb9 -r 412c2b3b5fc0 gtk/gtkprefs.c --- a/gtk/gtkprefs.c Mon Jan 15 19:03:37 2007 +0000 +++ b/gtk/gtkprefs.c Mon Jan 15 19:24:50 2007 +0000 @@ -1375,7 +1375,7 @@ #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 @@ 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 -r 315be2f86cb9 -r 412c2b3b5fc0 gtk/gtksound.c --- a/gtk/gtksound.c Mon Jan 15 19:03:37 2007 +0000 +++ b/gtk/gtksound.c Mon Jan 15 19:24:50 2007 +0000 @@ -527,7 +527,7 @@ /* 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 -r 315be2f86cb9 -r 412c2b3b5fc0 libgaim/prefs.c --- a/libgaim/prefs.c Mon Jan 15 19:03:37 2007 +0000 +++ b/libgaim/prefs.c Mon Jan 15 19:24:50 2007 +0000 @@ -900,9 +900,9 @@ 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 @@ 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 @@ 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 @@ 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; }