Changes in storage_xml.c [1f92a58:b75acf6]

File:

• storage_xml.c (modified) (8 diffs)

storage_xml.c

@@ -147 +147 @@
                                          arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
                 {
-                        xd->current_account = account_add( irc->b, prpl, handle, password );
+                        xd->current_account = account_add( irc, prpl, handle, password );
                         if( server )
                                 set_setstr( &xd->current_account->set, "server", server );
@@ -181 +181 @@
                                 xd->current_set_head = &xd->current_account->set;
                         else
-                                xd->current_set_head = &xd->irc->b->set;
+                                xd->current_set_head = &xd->irc->set;
                         
                         xd->current_setting = g_strdup( setting );
@@ -215 +215 @@
                 if( xd->current_account && handle && channel )
                 {
-                        //xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
+                        xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
                 }
                 else
@@ -353 +353 @@
 static storage_status_t xml_load( irc_t *irc, const char *password )
 {
-        return xml_load_real( irc, irc->user->nick, password, XML_PASS_UNKNOWN );
+        return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN );
 }
 
@@ -396 +396 @@
         md5_state_t md5_state;
         
-        path2 = g_strdup( irc->user->nick );
+        path2 = g_strdup( irc->nick );
         nick_lc( path2 );
         g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" );
@@ -422 +422 @@
         pass_buf = base64_encode( pass_md5, 21 );
         
-        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->user->nick, pass_buf, XML_FORMAT_VERSION ) )
+        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
                 goto write_error;
         
         g_free( pass_buf );
         
-        for( set = irc->b->set; set; set = set->next )
+        for( set = irc->set; set; set = set->next )
                 if( set->value )
                         if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                 goto write_error;
         
-        for( acc = irc->b->accounts; acc; acc = acc->next )
+        for( acc = irc->accounts; acc; acc = acc->next )
         {
                 unsigned char *pass_cr;
@@ -470 +470 @@
                         goto write_error;
                 
-#if 0
                 for( c = irc->chatrooms; c; c = c->next )
                 {
@@ -489 +488 @@
                                 goto write_error;
                 }
-#endif
                 
                 if( !xml_printf( fd, 1, "</account>\n" ) )