Mercurial > pidgin.yaz
comparison libpurple/prefs.c @ 20943:e0d7429cfd8a
merge of '4d5bbc54236419e777e3df044678b798605409bf'
and 'cca81a1b623d3a31f3a7d03158eddb36ecf4bfbc'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 15 Oct 2007 02:11:13 +0000 |
| parents | 999b77dcb63f |
| children | 3d7f36c57e68 |
comparison
equal
deleted
inserted
replaced
| 20940:d1695d02c498 | 20943:e0d7429cfd8a |
|---|---|
| 295 } else if(pref->type == PURPLE_PREF_PATH_LIST) { | 295 } else if(pref->type == PURPLE_PREF_PATH_LIST) { |
| 296 pref->value.stringlist = g_list_append(pref->value.stringlist, | 296 pref->value.stringlist = g_list_append(pref->value.stringlist, |
| 297 g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL)); | 297 g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL)); |
| 298 } | 298 } |
| 299 } | 299 } |
| 300 g_string_free(pref_name_full, TRUE); | |
| 300 } else { | 301 } else { |
| 301 char *decoded; | 302 char *decoded; |
| 302 | 303 |
| 303 if(!pref_name || !strcmp(pref_name, "/")) | 304 if(!pref_name || !strcmp(pref_name, "/")) |
| 304 return; | 305 return; |