Changeset 673a54c for storage_xml.c

Timestamp:

2009-03-12T19:33:28Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

fc34fb5

Parents:

823de9d (diff), 9e768da (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

pretty blind try at merging in the latest trunk

File:

• storage_xml.c (modified) (11 diffs)

storage_xml.c

@@ -38 +38 @@
 #endif
 
-#if !GLIB_CHECK_VERSION(2,8,0)
-/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
-#define g_access access
-#endif
-
 typedef enum
 {
@@ -59 +54 @@
         char *current_setting;
         account_t *current_account;
+        struct chat *current_chat;
+        set_t **current_set_head;
         char *given_nick;
         char *given_pass;
@@ -177 +174 @@
                 
                 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 )
+                                xd->current_set_head = &xd->current_account->set;
+                        else
+                                xd->current_set_head = &xd->irc->set;
+                        
                         xd->current_setting = g_strdup( setting );
+                }
                 else
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -199 +205 @@
                 }
         }
+        else if( g_strcasecmp( element_name, "chat" ) == 0 )
+        {
+                char *handle, *channel;
+                
+                handle = xml_attr( attr_names, attr_values, "handle" );
+                channel = xml_attr( attr_names, attr_values, "channel" );
+                
+                if( xd->current_account && handle && channel )
+                {
+                        xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
+                }
+                else
+                {
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Missing attributes for %s element", element_name );
+                }
+        }
         else
         {
@@ -219 +242 @@
                 xd->current_account = NULL;
         }
+        else if( g_strcasecmp( element_name, "chat" ) == 0 )
+        {
+                xd->current_chat = NULL;
+        }
 }
 
@@ -225 +252 @@
         char text[text_len+1];
         struct xml_parsedata *xd = data;
-        irc_t *irc = xd->irc;
         
         strncpy( text, text_orig, text_len );
@@ -238 +264 @@
         else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting )
         {
-                set_setstr( xd->current_account ? &xd->current_account->set : &irc->set,
-                            xd->current_setting, (char*) text );
+                set_setstr( xd->current_set_head, xd->current_setting, (char*) text );
                 g_free( xd->current_setting );
                 xd->current_setting = NULL;
@@ -402 +427 @@
         
         for( set = irc->set; set; set = set->next )
-                if( set->value && set->def )
+                if( set->value )
                         if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                 goto write_error;
@@ -411 +436 @@
                 char *pass_b64;
                 int pass_len;
+                struct chat *c;
                 
                 pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password, 12 );
@@ -429 +455 @@
                 
                 for( set = acc->set; set; set = set->next )
-                        if( set->value && set->def && !( set->flags & ACC_SET_NOSAVE ) )
+                        if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
                                 if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                         goto write_error;
@@ -443 +469 @@
                         goto write_error;
                 
+                for( c = irc->chatrooms; c; c = c->next )
+                {
+                        if( c->acc != acc )
+                                continue;
+                        
+                        if( !xml_printf( fd, 2, "<chat handle=\"%s\" channel=\"%s\" type=\"%s\">\n",
+                                                c->handle, c->channel, "room" ) )
+                                goto write_error;
+                        
+                        for( set = c->set; set; set = set->next )
+                                if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
+                                        if( !xml_printf( fd, 3, "<setting name=\"%s\">%s</setting>\n",
+                                                                set->key, set->value ) )
+                                                goto write_error;
+
+                        if( !xml_printf( fd, 2, "</chat>\n" ) )
+                                goto write_error;
+                }
+                
                 if( !xml_printf( fd, 1, "</account>\n" ) )
                         goto write_error;