Mercurial > pidgin
diff libpurple/protocols/silc/silc.c @ 32310:6135b24cdc8a
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 |
line wrap: on
line diff
--- a/libpurple/protocols/silc/silc.c Tue Oct 18 21:11:40 2011 +0000 +++ b/libpurple/protocols/silc/silc.c Tue Oct 18 21:17:08 2011 +0000 @@ -528,7 +528,7 @@ g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir()); if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd), (char *)purple_account_get_string(account, "private-key", prd), - (gc->password == NULL) ? "" : gc->password, + (purple_connection_get_password(gc) == NULL) ? "" : purple_connection_get_password(gc), &sg->public_key, &sg->private_key)) { if (!purple_account_get_password(account)) { purple_account_request_password(account, G_CALLBACK(silcpurple_got_password_cb),