Changeset 547ea68

Timestamp:

2010-06-27T15:32:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

134a02c

Parents:

84c3a72

Message:

Save and load channels. Also fixing a bug in creating non-control channels
with a &-name.

Files:

• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (6 diffs)

root_commands.c

@@ -1019 +1019 @@
                 
                 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", cmd[2] ) &&

storage_xml.c

@@ -175 +175 @@
                 if( ( setting = xml_attr( attr_names, attr_values, "name" ) ) )
                 {
-                        /*
-                        if( xd->current_chat != NULL )
-                                xd->current_set_head = &xd->current_chat->set;
-                        else
-                        */
-                        if( xd->current_account != NULL )
+                        if( xd->current_channel != NULL )
+                                xd->current_set_head = &xd->current_channel->set;
+                        else if( xd->current_account != NULL )
                                 xd->current_set_head = &xd->current_account->set;
                         else
@@ -208 +205 @@
                 }
         }
+        else if( g_strcasecmp( element_name, "channel" ) == 0 )
+        {
+                char *name, *type;
+                
+                name = xml_attr( attr_names, attr_values, "name" );
+                type = xml_attr( attr_names, attr_values, "type" );
+                
+                if( !name || !type )
+                {
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Missing attributes for %s element", element_name );
+                        return;
+                }
+                
+                if( ( xd->current_channel = irc_channel_by_name( irc, name ) ) ||
+                    ( xd->current_channel = irc_channel_new( irc, name ) ) )
+                        set_setstr( &xd->current_channel->set, "type", type );
+        }
+        /* Backward compatibility: Keep this around for a while for people
+           switching from BitlBee 1.2.4+. */
         else if( g_strcasecmp( element_name, "chat" ) == 0 )
         {
@@ -225 +242 @@
                         
                         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, "room", handle ) )
                         {
-                                /* Nothing else to do for now, really. */
+                                /* Try to pick up some settings where possible. */
+                                xd->current_channel = ic;
                         }
                         else if( ic )
@@ -262 +281 @@
                 xd->current_account = NULL;
         }
-        else if( g_strcasecmp( element_name, "chat" ) == 0 )
-        {
-                /* xd->current_chat = NULL; */
+        else if( g_strcasecmp( element_name, "channel" ) == 0 ||
+                 g_strcasecmp( element_name, "chat" ) == 0 )
+        {
+                xd->current_channel = NULL;
         }
 }
@@ -414 +434 @@
         md5_byte_t pass_md5[21];
         md5_state_t md5_state;
+        GSList *l;
         
         path2 = g_strdup( irc->user->nick );
@@ -492 +513 @@
         }
         
+        for( l = irc->channels; l; l = l->next )
+        {
+                irc_channel_t *ic = l->data;
+                
+                if( !xml_printf( fd, 1, "<channel name=\"%s\" type=\"%s\">\n",
+                                 ic->name, set_getstr( &ic->set, "type" ) ) )
+                        goto write_error;
+                
+                for( set = ic->set; set; set = set->next )
+                        if( set->value && strcmp( set->key, "type" ) != 0 )
+                                if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
+                                        goto write_error;
+                
+                if( !xml_printf( fd, 1, "</channel>\n" ) )
+                        goto write_error;
+        }
+        
         if( !xml_printf( fd, 0, "</user>\n" ) )
                 goto write_error;