Changeset 84c3a72

Timestamp:

2010-06-27T12:39:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

547ea68

Parents:

e907683

Message:

Import chatrooms configured in older BitlBee versions. Settings are currently
ignored though. Also removing the old chat.[ch] files since they're really not
important anymore.

Files:

• irc_commands.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• protocols/chat.c (deleted)
• protocols/chat.h (deleted)
• protocols/nogaim.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (7 diffs)

irc_commands.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "ipc.h"
-#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )

protocols/account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
-#include "chat.h"
 
 account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass )

protocols/nogaim.c

@@ -36 +36 @@
 
 #include "nogaim.h"
-#include "chat.h"
 
 GSList *connections;

root_commands.c

@@ -28 +28 @@
 #include "bitlbee.h"
 #include "help.h"
-#include "chat.h"
 
 #include <string.h>

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
-#include "chat.h"
 
 #if GLIB_CHECK_VERSION(2,8,0)
@@ -55 +54 @@
         char *current_setting;
         account_t *current_account;
-        struct chat *current_chat;
+        irc_channel_t *current_channel;
         set_t **current_set_head;
         char *given_nick;
@@ -176 +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 )
+                        else
+                        */
+                        if( xd->current_account != NULL )
                                 xd->current_set_head = &xd->current_account->set;
                         else
@@ -215 +217 @@
                 if( xd->current_account && handle && channel )
                 {
-                        //xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
+                        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, "chat_type", "room" ) &&
+                            set_setstr( &ic->set, "account", acc ) &&
+                            set_setstr( &ic->set, "room", handle ) )
+                        {
+                                /* Nothing else to do for now, really. */
+                        }
+                        else if( ic )
+                                irc_channel_free( ic );
+                        
+                        g_free( acc );
                 }
                 else
@@ -245 +264 @@
         else if( g_strcasecmp( element_name, "chat" ) == 0 )
         {
-                xd->current_chat = NULL;
+                /* xd->current_chat = NULL; */
         }
 }
@@ -437 +456 @@
                 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 );
@@ -470 +488 @@
                         goto write_error;
                 
-#if 0
-                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;
-                }
-#endif
-                
                 if( !xml_printf( fd, 1, "</account>\n" ) )
                         goto write_error;