comparison libpurple/protocols/silc10/silc.c @ 21284:6de09629f091

propagate from branch 'im.pidgin.pidgin.next.minor' (head 0c9637482b845cc65e95a26e144697391c51133f) to branch 'im.pidgin.pidgin' (head e3a6991e78dac328f13804950fee54dfb8afc3c5)
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 10 Nov 2007 04:52:20 +0000
parents 319f5ff72eba 35b4f1dc4c8d
children 665e04562de0
comparison
equal deleted inserted replaced
21283:406aa3be6b32 21284:6de09629f091
329 g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir()); 329 g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir());
330 if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd), 330 if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd),
331 (char *)purple_account_get_string(account, "private-key", prd), 331 (char *)purple_account_get_string(account, "private-key", prd),
332 (gc->password == NULL) ? "" : gc->password, &client->pkcs, 332 (gc->password == NULL) ? "" : gc->password, &client->pkcs,
333 &client->public_key, &client->private_key)) { 333 &client->public_key, &client->private_key)) {
334 g_snprintf(pkd, sizeof(pkd), _("Could not load SILC key pair: %s"), strerror(errno)); 334 g_snprintf(pkd, sizeof(pkd), _("Could not load SILC key pair: %s"), g_strerror(errno));
335 purple_connection_error(gc, pkd); 335 purple_connection_error(gc, pkd);
336 return; 336 return;
337 } 337 }
338 338
339 sg = silc_calloc(1, sizeof(*sg)); 339 sg = silc_calloc(1, sizeof(*sg));