Changeset 7e3592e

Timestamp:

2006-07-05T18:34:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

75a4b85

Parents:

5b52a48

Message:

Fixed text_load(), added detection of primary storage backends without
save support (which shouldn't be allowed) and added a call to nick_lc()
to xml_save() so at least nicks should now be case-insensitive.

Files:

• storage.c (modified) (1 diff)
• storage_text.c (modified) (5 diffs)
• storage_xml.c (modified) (1 diff)

storage.c

@@ -70 +70 @@
         
         storage = storage_init_single(primary);
-        if (storage == NULL)
+        if (storage == NULL && storage->save == NULL)
                 return NULL;
 

storage_text.c

@@ -28 +28 @@
 #include "crypting.h"
 
-/* DO NOT USE THIS FUNCTION IN NEW CODE. This 
- * function is here merely because the save/load code still uses 
- * ids rather than names */
-static struct prpl *find_protocol_by_id(int id)
-{
-        switch (id) {
-        case 0: case 1: case 3: return find_protocol("oscar");
-        case 4: return find_protocol("msn");
-        case 2: return find_protocol("yahoo");
-        case 8: return find_protocol("jabber");
-        default: break;
-        }
-        return NULL;
-}
-
-static int find_protocol_id(const char *name)
-{
-        if (!strcmp(name, "oscar")) return 1;
-        if (!strcmp(name, "msn")) return 4;
-        if (!strcmp(name, "yahoo")) return 2;
-        if (!strcmp(name, "jabber")) return 8;
-
-        return -1;
-}
-
-
 static void text_init (void)
 {
@@ -70 +44 @@
         FILE *fp;
         user_t *ru = user_find( irc, ROOT_NICK );
+        account_t *acc, *acc_lookup[9];
         
         if( irc->status & USTATUS_IDENTIFIED )
@@ -80 +55 @@
         fscanf( fp, "%32[^\n]s", s );
 
-        if (checkpass (password, s) != 0) 
+        if( checkpass( password, s ) != 0 )
         {
                 fclose( fp );
@@ -100 +75 @@
         fclose( fp );
         
+        /* Build a list with the first listed account of every protocol
+           number. So if the user had nicks defined for a second account on
+           the same IM network, those nicks will be added to the wrong
+           account, and the user should rename those buddies again. But at
+           least from now on things will be saved properly. */
+        memset( acc_lookup, 0, sizeof( acc_lookup ) );
+        for( acc = irc->accounts; acc; acc = acc->next )
+        {
+                if( acc_lookup[0] == NULL && strcmp( acc->prpl->name, "oscar" ) == 0 )
+                        acc_lookup[0] = acc_lookup[1] = acc_lookup[3] = acc;
+                else if( acc_lookup[2] == NULL && strcmp( acc->prpl->name, "yahoo" ) == 0 )
+                        acc_lookup[2] = acc;
+                else if( acc_lookup[4] == NULL && strcmp( acc->prpl->name, "msn" ) == 0 )
+                        acc_lookup[4] = acc;
+                else if( acc_lookup[8] == NULL && strcmp( acc->prpl->name, "jabber" ) == 0 )
+                        acc_lookup[8] = acc;
+        }
+        
         g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".nicks" );
         fp = fopen( s, "r" );
@@ -105 +98 @@
         while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
         {
-                struct prpl *prpl;
-
-                prpl = find_protocol_by_id(proto);
-
-                if (!prpl)
+                if( ( acc = acc_lookup[proto] ) == NULL )
                         continue;
-
+                
                 http_decode( s );
-                // FIXME!!!! nick_set( irc, s, prpl, nick );
+                nick_set( acc, s, nick );
         }
         fclose( fp );

storage_xml.c

@@ -382 +382 @@
         }
         
-        g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, irc->nick, ".xml" );
+        path2 = g_strdup( irc->nick );
+        nick_lc( path2 );
+        g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" );
+        g_free( path2 );
         
         if( !overwrite && access( path, F_OK ) != -1 )