Mercurial > pidgin.yaz
changeset 15326:ac460d00e235
[gaim-migrate @ 18116]
baby steps toward having correct path handling...others can feel free to chime in and fix stuff
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 12 Jan 2007 22:48:13 +0000 |
| parents | e3ea20c6e73f |
| children | 1f33d20e973d |
| files | console/gntprefs.c gtk/gtkprefs.c gtk/gtksound.c libgaim/plugin.c |
| diffstat | 4 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/console/gntprefs.c Fri Jan 12 22:17:32 2007 +0000 +++ b/console/gntprefs.c Fri Jan 12 22:48:13 2007 +0000 @@ -36,7 +36,7 @@ gaim_prefs_add_none("/gaim/gnt"); gaim_prefs_add_none("/gaim/gnt/plugins"); - gaim_prefs_add_string_list("/gaim/gnt/plugins/loaded", NULL); + gaim_prefs_add_path_list("/gaim/gnt/plugins/loaded", NULL); gaim_prefs_add_none("/gaim/gnt/conversations"); gaim_prefs_add_bool("/gaim/gnt/conversations/timestamps", TRUE);
--- a/gtk/gtkprefs.c Fri Jan 12 22:17:32 2007 +0000 +++ b/gtk/gtkprefs.c Fri Jan 12 22:48:13 2007 +0000 @@ -1468,7 +1468,7 @@ pref = g_strdup_printf("/gaim/gtk/sound/file/%s", gaim_gtk_sound_get_event_option(sound_row_sel)); - gaim_prefs_set_string(pref, ""); + gaim_prefs_set_path(pref, ""); g_free(pref); gtk_entry_set_text(GTK_ENTRY(sound_entry), "(default)"); @@ -1485,7 +1485,7 @@ /* Set it -- and forget it */ pref = g_strdup_printf("/gaim/gtk/sound/file/%s", gaim_gtk_sound_get_event_option(sound)); - gaim_prefs_set_string(pref, filename); + gaim_prefs_set_path(pref, filename); g_free(pref); /* @@ -1503,7 +1503,7 @@ pref = g_strdup_printf("/gaim/gtk/sound/file/%s", gaim_gtk_sound_get_event_option(sound_row_sel)); - filename = gaim_prefs_get_string(pref); + filename = gaim_prefs_get_path(pref); g_free(pref); if (*filename == '\0') @@ -1555,7 +1555,7 @@ pref = g_strdup_printf("/gaim/gtk/sound/file/%s", gaim_gtk_sound_get_event_option(sound_row_sel)); - file = gaim_prefs_get_string(pref); + file = gaim_prefs_get_path(pref); g_free(pref); if (sound_entry) gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)"); @@ -1748,7 +1748,7 @@ sound_entry = gtk_entry_new(); pref = g_strdup_printf("/gaim/gtk/sound/file/%s", gaim_gtk_sound_get_event_option(0)); - file = gaim_prefs_get_string(pref); + file = gaim_prefs_get_path(pref); g_free(pref); gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)"); gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE); @@ -2040,7 +2040,7 @@ /* Plugins */ gaim_prefs_add_none("/gaim/gtk/plugins"); - gaim_prefs_add_string_list("/gaim/gtk/plugins/loaded", NULL); + gaim_prefs_add_path_list("/gaim/gtk/plugins/loaded", NULL); /* File locations */ gaim_prefs_add_none("/gaim/gtk/filelocations");
--- a/gtk/gtksound.c Fri Jan 12 22:17:32 2007 +0000 +++ b/gtk/gtksound.c Fri Jan 12 22:48:13 2007 +0000 @@ -277,30 +277,30 @@ gaim_prefs_add_none("/gaim/gtk/sound/enabled"); gaim_prefs_add_none("/gaim/gtk/sound/file"); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/login", TRUE); - gaim_prefs_add_string("/gaim/gtk/sound/file/login", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/login", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/logout", TRUE); - gaim_prefs_add_string("/gaim/gtk/sound/file/logout", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/logout", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/im_recv", TRUE); - gaim_prefs_add_string("/gaim/gtk/sound/file/im_recv", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/im_recv", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/first_im_recv", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/first_im_recv", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/first_im_recv", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/send_im", TRUE); - gaim_prefs_add_string("/gaim/gtk/sound/file/send_im", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/send_im", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/join_chat", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/join_chat", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/join_chat", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/left_chat", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/left_chat", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/left_chat", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/send_chat_msg", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/send_chat_msg", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/send_chat_msg", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/chat_msg_recv", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/chat_msg_recv", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/chat_msg_recv", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/nick_said", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/file/nick_said", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/nick_said", ""); gaim_prefs_add_bool("/gaim/gtk/sound/enabled/pounce_default", TRUE); - gaim_prefs_add_string("/gaim/gtk/sound/file/pounce_default", ""); + gaim_prefs_add_path("/gaim/gtk/sound/file/pounce_default", ""); gaim_prefs_add_bool("/gaim/gtk/sound/conv_focus", TRUE); gaim_prefs_add_bool("/gaim/gtk/sound/mute", FALSE); - gaim_prefs_add_string("/gaim/gtk/sound/command", ""); + gaim_prefs_add_path("/gaim/gtk/sound/command", ""); gaim_prefs_add_string("/gaim/gtk/sound/method", "automatic"); gaim_prefs_add_int("/gaim/gtk/sound/volume", 50);
--- a/libgaim/plugin.c Fri Jan 12 22:17:32 2007 +0000 +++ b/libgaim/plugin.c Fri Jan 12 22:48:13 2007 +0000 @@ -1216,7 +1216,7 @@ } } - gaim_prefs_set_string_list(key, files); + gaim_prefs_set_path_list(key, files); g_list_free(files); #endif } @@ -1229,7 +1229,7 @@ g_return_if_fail(key != NULL); - files = gaim_prefs_get_string_list(key); + files = gaim_prefs_get_path_list(key); for (f = files; f; f = f->next) {