Changeset 5b52a48 for storage_xml.c

Timestamp:

2006-07-03T21:22:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7e3592e

Parents:

911f2eb

Message:

Implemented per-account nick lists instead of per-protocol nick lists.
nick_t is dead, instead nicks are just saves in a per-account_t GLib
hash table. While doing this, the import_buddies command finally died
and text_save() disappeared, because the old file format can't handle
most of the new features in this branch anyway.

Still have to implement support for the new nick lists in text_load()!

File:

• storage_xml.c (modified) (4 diffs)

storage_xml.c

@@ -197 +197 @@
                 if( xd->current_account && handle && nick )
                 {
-                        nick_set( irc, handle, xd->current_account->prpl, nick );
+                        nick_set( xd->current_account, handle, nick );
                 }
                 else
@@ -365 +365 @@
 }
 
+static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data );
+
 static storage_status_t xml_save( irc_t *irc, int overwrite )
 {
         char path[512], *path2, *pass_buf = NULL;
         set_t *set;
-        nick_t *nick;
         account_t *acc;
         int fd;
@@ -440 +441 @@
                                         goto write_error;
                 
-                for( nick = irc->nicks; nick; nick = nick->next )
-                        if( nick->proto == acc->prpl )
-                                if( !xml_printf( fd, 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", nick->handle, nick->nick ) )
-                                        goto write_error;
+                /* This probably looks pretty strange. g_hash_table_foreach
+                   is quite a PITA already (but it can't get much better in
+                   C without using #define, I'm afraid), and since it
+                   doesn't seem to be possible to abort the foreach on write
+                   errors, so instead let's use the _find function and
+                   return TRUE on write errors. Which means, if we found
+                   something, there was an error. :-) */
+                if( g_hash_table_find( acc->nicks, xml_save_nick, (gpointer) fd ) )
+                        goto write_error;
                 
                 if( !xml_printf( fd, 1, "</account>\n" ) )
@@ -476 +482 @@
         
         return STORAGE_OTHER_ERROR;
+}
+
+static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data )
+{
+        return !xml_printf( (int) data, 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", key, value );
 }