Merge remote-tracking branch 'peterlvilim/keyring'

This commit is contained in:
James Booth
2015-01-13 00:41:56 +00:00
13 changed files with 98 additions and 23 deletions

View File

@@ -307,7 +307,7 @@ void cmd_otr_gen_generates_key_for_connected_account(void **state)
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "gen", NULL };
char *account_name = "myaccount";
ProfAccount *account = account_new(account_name, "me@jabber.org", NULL,
ProfAccount *account = account_new(account_name, "me@jabber.org", NULL, NULL,
TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL);
will_return(jabber_get_connection_status, JABBER_CONNECTED);