Mercurial > pidgin

comparison libpurple/protocols/silc/util.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
comparison
equal deleted inserted replaced
32309:a78523019e7a 32310:6135b24cdc8a
208 purple_connection_update_progress(gc, _("Creating SILC key pair..."), 1, 5); 208 purple_connection_update_progress(gc, _("Creating SILC key pair..."), 1, 5);
209 if (!silc_create_key_pair(SILCPURPLE_DEF_PKCS, 209 if (!silc_create_key_pair(SILCPURPLE_DEF_PKCS,
210 SILCPURPLE_DEF_PKCS_LEN, 210 SILCPURPLE_DEF_PKCS_LEN,
211 file_public_key, 211 file_public_key,
212 file_private_key, NULL, 212 file_private_key, NULL,
213 (gc->password == NULL) 213 (purple_connection_get_password(gc) == NULL) ? "" : purple_connection_get_password(gc),
214 ? "" : gc->password,
215 NULL, NULL, FALSE)) { 214 NULL, NULL, FALSE)) {
216 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, 215 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
217 _("Unable to create SILC key pair")); 216 _("Unable to create SILC key pair"));
218 return FALSE; 217 return FALSE;
219 } 218 }
251 purple_connection_update_progress(gc, _("Creating SILC key pair..."), 1, 5); 250 purple_connection_update_progress(gc, _("Creating SILC key pair..."), 1, 5);
252 if (!silc_create_key_pair(SILCPURPLE_DEF_PKCS, 251 if (!silc_create_key_pair(SILCPURPLE_DEF_PKCS,
253 SILCPURPLE_DEF_PKCS_LEN, 252 SILCPURPLE_DEF_PKCS_LEN,
254 file_public_key, 253 file_public_key,
255 file_private_key, NULL, 254 file_private_key, NULL,
256 (gc->password == NULL) 255 (purple_connection_get_password(gc) == NULL) ? "" : purple_connection_get_password(gc),
257 ? "" : gc->password,
258 NULL, NULL, FALSE)) { 256 NULL, NULL, FALSE)) {
259 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, 257 purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
260 _("Unable to create SILC key pair")); 258 _("Unable to create SILC key pair"));
261 return FALSE; 259 return FALSE;
262 } 260 }