diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-06-30 11:17:18 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-06-30 11:17:18 +0200 |
| commit | 5c9512ffa716f2bc8bbf9e2c31ee40624a0ff842 (patch) | |
| tree | aabc3b72023844f6177c8f7178b23b16e66340b8 /storage_xml.c | |
| parent | 171946457cccb7280f0918201093e79bbc9eac72 (diff) | |
Made set.c API more generic so it's not specific to irc_t structures anymore,
but can be used for account_t structures too, for example.
Diffstat (limited to 'storage_xml.c')
| -rw-r--r-- | storage_xml.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage_xml.c b/storage_xml.c index 5a8b51ef..e0ffc481 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -245,7 +245,7 @@ static void xml_text( GMarkupParseContext *ctx, const gchar *text, gsize text_le else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting && xd->current_account == NULL ) { - set_setstr( irc, xd->current_setting, (char*) text ); + set_setstr( &irc->set, xd->current_setting, (char*) text ); g_free( xd->current_setting ); xd->current_setting = NULL; } @@ -420,14 +420,13 @@ static storage_status_t xml_save( irc_t *irc, int overwrite ) pass_len = rc4_encode( (unsigned char*) acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password ); pass_b64 = base64_encode( pass_rc4, pass_len ); + g_free( pass_rc4 ); if( !xml_printf( fd, "\t<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) ) { - g_free( pass_rc4 ); g_free( pass_b64 ); goto write_error; } - g_free( pass_rc4 ); g_free( pass_b64 ); if( acc->server && acc->server[0] && !xml_printf( fd, " server=\"%s\"", acc->server ) ) |