Changeset d995c9b

Timestamp:

2008-08-31T14:54:39Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3611717

Parents:

39f93f0

Message:

Added cleanup code.

Files:

• account.c (modified) (2 diffs)
• chat.c (modified) (1 diff)
• chat.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)

account.c

@@ -190 +190 @@
 {
         account_t *a, *l = NULL;
+        struct chat *c, *nc;
         
         if( acc->ic )
@@ -202 +203 @@
                         else
                                 irc->accounts = a->next;
+                        
+                        for( c = irc->chatrooms; c; c = nc )
+                                if( acc == c->acc )
+                                {
+                                        nc = c->next;
+                                        chat_del( irc, c );
+                                }
                         
                         while( a->set )

chat.c

@@ -126 +126 @@
 }
 
+int chat_del( irc_t *irc, struct chat *chat )
+{
+        struct chat *c, *l = NULL;
+        
+        for( c = irc->chatrooms; c; c = (l=c)->next )
+                if( c == chat )
+                        break;
+        
+        if( c == NULL )
+                return 0;
+        else if( l == NULL )
+                irc->chatrooms = c->next;
+        else
+                l->next = c->next;
+        
+        while( c->set )
+                set_del( &c->set, c->set->key );
+        
+        g_free( c->handle );
+        g_free( c->channel );
+        g_free( c );
+        
+        return 1;
+}
+
 int chat_chancmp( char *a, char *b )
 {

chat.h

@@ -39 +39 @@
 struct chat *chat_bychannel( irc_t *irc, char *channel );
 struct chat *chat_get( irc_t *irc, char *id );
+int chat_del( irc_t *irc, struct chat *chat );
 
 int chat_chancmp( char *a, char *b );

root_commands.c

@@ -1050 +1050 @@
         {
                 cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead );
+        }
+        else if( g_strcasecmp( cmd[1], "del" ) == 0 )
+        {
+                if( !cmd[2] )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
+                        return;
+                }
+                
+                if( ( c = chat_get( irc, cmd[2] ) ) )
+                {
+                        chat_del( irc, c );
+                }
+                else
+                {
+                        irc_usermsg( irc, "Could not remove chat." );
+                }
         }
         else if( g_strcasecmp( cmd[1], "with" ) == 0 )