Mercurial > pidgin

comparison libpurple/protocols/silc/silc.c @ 32310:6135b24cdc8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Samtime: Move the "inpa" input watcher into protocol_data.
author andrew.victor@mxit.com
date Tue, 18 Oct 2011 21:17:08 +0000
parents 2ec94166be43
children 3e7a7e14af62
comparison
equal deleted inserted replaced
32309:a78523019e7a 32310:6135b24cdc8a
526 /* Load SILC key pair */ 526 /* Load SILC key pair */
527 g_snprintf(pkd, sizeof(pkd), "%s" G_DIR_SEPARATOR_S "public_key.pub", silcpurple_silcdir()); 527 g_snprintf(pkd, sizeof(pkd), "%s" G_DIR_SEPARATOR_S "public_key.pub", silcpurple_silcdir());
528 g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir()); 528 g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir());
529 if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd), 529 if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd),
530 (char *)purple_account_get_string(account, "private-key", prd), 530 (char *)purple_account_get_string(account, "private-key", prd),
531 (gc->password == NULL) ? "" : gc->password, 531 (purple_connection_get_password(gc) == NULL) ? "" : purple_connection_get_password(gc),
532 &sg->public_key, &sg->private_key)) { 532 &sg->public_key, &sg->private_key)) {
533 if (!purple_account_get_password(account)) { 533 if (!purple_account_get_password(account)) {
534 purple_account_request_password(account, G_CALLBACK(silcpurple_got_password_cb), 534 purple_account_request_password(account, G_CALLBACK(silcpurple_got_password_cb),
535 G_CALLBACK(silcpurple_no_password_cb), gc); 535 G_CALLBACK(silcpurple_no_password_cb), gc);
536 return; 536 return;