Mercurial > pidgin.yaz

comparison libpurple/certificate.c @ 19010:0d4b84820390

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fix overzealous escaping cause by ancestor revision
author William Ehlhardt <williamehlhardt@gmail.com>
date Mon, 09 Jul 2007 04:58:14 +0000
parents b64aa0222a7a
children b1090cbfc286
comparison
equal deleted inserted replaced
19009:b64aa0222a7a 19010:0d4b84820390
205 205
206 206
207 gchar * 207 gchar *
208 purple_certificate_pool_mkpath(PurpleCertificatePool *pool, const gchar *id) 208 purple_certificate_pool_mkpath(PurpleCertificatePool *pool, const gchar *id)
209 { 209 {
210 gchar *path, *path2; 210 gchar *path;
211 gchar *esc_scheme_name, *esc_name, *esc_id;
211 212
212 g_return_val_if_fail(pool, NULL); 213 g_return_val_if_fail(pool, NULL);
213 g_return_val_if_fail(pool->scheme_name, NULL); 214 g_return_val_if_fail(pool->scheme_name, NULL);
214 g_return_val_if_fail(pool->name, NULL); 215 g_return_val_if_fail(pool->name, NULL);
215 216
217 /* Escape all the elements for filesystem-friendliness */
218 esc_scheme_name = g_strdup(purple_escape_filename(pool->scheme_name));
219 esc_name = g_strdup(purple_escape_filename(pool->name));
220 esc_id = g_strdup(purple_escape_filename(id));
221
216 path = g_build_filename(purple_user_dir(), 222 path = g_build_filename(purple_user_dir(),
217 "certificates", /* TODO: constantize this? */ 223 "certificates", /* TODO: constantize this? */
218 pool->scheme_name, 224 esc_scheme_name,
219 pool->name, 225 esc_name,
220 id, 226 esc_id,
221 NULL); 227 NULL);
222 228
223 path2 = g_strdup(purple_escape_filename(path)); 229 g_free(esc_scheme_name);
224 230 g_free(esc_name);
225 g_free(path); 231 g_free(esc_id);
226 return path2; 232 return path;
227 } 233 }
228 234
229 gboolean 235 gboolean
230 purple_certificate_pool_contains(PurpleCertificatePool *pool, const gchar *id) 236 purple_certificate_pool_contains(PurpleCertificatePool *pool, const gchar *id)
231 { 237 {