Changeset e135cd09 for storage_xml.c
- Timestamp:
- 2010-07-24T15:58:27Z (14 years ago)
- Branches:
- master
- Children:
- 0f28785
- Parents:
- 40e6dac
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
storage_xml.c
r40e6dac re135cd09 127 127 else if( g_strcasecmp( element_name, "account" ) == 0 ) 128 128 { 129 char *protocol, *handle, *server, *password = NULL, *autoconnect ;129 char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag; 130 130 char *pass_b64 = NULL; 131 131 unsigned char *pass_cr = NULL; … … 137 137 server = xml_attr( attr_names, attr_values, "server" ); 138 138 autoconnect = xml_attr( attr_names, attr_values, "autoconnect" ); 139 tag = xml_attr( attr_names, attr_values, "tag" ); 139 140 140 141 protocol = xml_attr( attr_names, attr_values, "protocol" ); … … 156 157 if( autoconnect ) 157 158 set_setstr( &xd->current_account->set, "auto_connect", autoconnect ); 159 if( tag ) 160 set_setstr( &xd->current_account->set, "tag", tag ); 158 161 } 159 162 else … … 244 247 { 245 248 irc_channel_t *ic; 246 char *acc;247 248 acc = g_strdup_printf( "%s(%s)",249 xd->current_account->prpl->name,250 xd->current_account->user );251 249 252 250 if( ( ic = irc_channel_new( irc, channel ) ) && 253 251 set_setstr( &ic->set, "type", "chat" ) && 254 252 set_setstr( &ic->set, "chat_type", "room" ) && 255 set_setstr( &ic->set, "account", acc) &&253 set_setstr( &ic->set, "account", xd->current_account->tag ) && 256 254 set_setstr( &ic->set, "room", handle ) ) 257 255 { … … 261 259 else if( ic ) 262 260 irc_channel_free( ic ); 263 264 g_free( acc );265 261 } 266 262 else … … 502 498 g_free( pass_cr ); 503 499 504 if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) ) 500 if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" " 501 "autoconnect=\"%d\" tag=\"%s\"", acc->prpl->name, acc->user, 502 pass_b64, acc->auto_connect, acc->tag ) ) 505 503 { 506 504 g_free( pass_b64 );
Note: See TracChangeset
for help on using the changeset viewer.