Changeset e135cd09

Timestamp:

2010-07-24T15:58:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0f28785

Parents:

40e6dac

Message:

Use the account tag in a few places and store it in the XML file as an
attribute, not as a setting (since all accounts have it anyway).

Files:

• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• storage_xml.c (modified) (6 diffs)

irc_channel.c

@@ -579 +579 @@
                 bee_irc_channel_update( ic->irc, ic, NULL );
         
-        return g_strdup_printf( "%s(%s)", acc->prpl->name, acc->user );
+        return g_strdup( acc->tag );
 }
 

irc_im.c

@@ -805 +805 @@
                 acc->prpl->chat_add_settings( acc, &ic->set );
         
-        return g_strdup_printf( "%s(%s)", acc->prpl->name, acc->user );
+        return g_strdup( acc->tag );
 }
 

protocols/account.c

@@ -67 +67 @@
         
         s = set_add( &a->set, "tag", NULL, set_eval_account, a );
+        s->flags |= ACC_SET_NOSAVE;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );

storage_xml.c

@@ -127 +127 @@
         else if( g_strcasecmp( element_name, "account" ) == 0 )
         {
-                char *protocol, *handle, *server, *password = NULL, *autoconnect;
+                char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag;
                 char *pass_b64 = NULL;
                 unsigned char *pass_cr = NULL;
@@ -137 +137 @@
                 server = xml_attr( attr_names, attr_values, "server" );
                 autoconnect = xml_attr( attr_names, attr_values, "autoconnect" );
+                tag = xml_attr( attr_names, attr_values, "tag" );
                 
                 protocol = xml_attr( attr_names, attr_values, "protocol" );
@@ -156 +157 @@
                         if( autoconnect )
                                 set_setstr( &xd->current_account->set, "auto_connect", autoconnect );
+                        if( tag )
+                                set_setstr( &xd->current_account->set, "tag", tag );
                 }
                 else
@@ -244 +247 @@
                 {
                         irc_channel_t *ic;
-                        char *acc;
-                        
-                        acc = g_strdup_printf( "%s(%s)",
-                                               xd->current_account->prpl->name,
-                                               xd->current_account->user );
                         
                         if( ( ic = irc_channel_new( irc, channel ) ) &&
                             set_setstr( &ic->set, "type", "chat" ) &&
                             set_setstr( &ic->set, "chat_type", "room" ) &&
-                            set_setstr( &ic->set, "account", acc ) &&
+                            set_setstr( &ic->set, "account", xd->current_account->tag ) &&
                             set_setstr( &ic->set, "room", handle ) )
                         {
@@ -261 +259 @@
                         else if( ic )
                                 irc_channel_free( ic );
-                        
-                        g_free( acc );
                 }
                 else
@@ -502 +498 @@
                 g_free( pass_cr );
                 
-                if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )
+                if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" "
+                                        "autoconnect=\"%d\" tag=\"%s\"", acc->prpl->name, acc->user,
+                                        pass_b64, acc->auto_connect, acc->tag ) )
                 {
                         g_free( pass_b64 );