Changes in / [83e2d30:3709301]

Files:

• ipc.c (modified) (2 diffs)
• ipc.h (modified) (2 diffs)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (10 diffs)

ipc.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -29 +29 @@
 #include "commands.h"
 #ifndef _WIN32
+#include <sys/uio.h>
 #include <sys/un.h>
 #endif

ipc.h

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
-#include <sys/uio.h>
 
 

irc_channel.c

@@ -549 +549 @@
         icc->type = IRC_CC_TYPE_DEFAULT;
         
-        if( bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) )
-        {
-                set_setstr( &ic->set, "group", ic->name + 1 );
-                set_setstr( &ic->set, "fill_by", "group" );
-        }
-        else if( set_setstr( &ic->set, "protocol", ic->name + 1 ) )
-        {
-                set_setstr( &ic->set, "fill_by", "protocol" );
-        }
-        else if( set_setstr( &ic->set, "account", ic->name + 1 ) )
-        {
-                set_setstr( &ic->set, "fill_by", "account" );
-        }
-        else
-        {
-                bee_irc_channel_update( ic->irc, ic, NULL );
-        }
-        
         return TRUE;
 }

irc_commands.c

@@ -141 +141 @@
                 
                 if( ( ic = irc_channel_by_name( irc, s ) ) == NULL )
+                {
                         ic = irc_channel_new( irc, s );
+                        
+                        if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 )
+                        {
+                                /* Autoconfiguration is for control channels only ATM. */
+                        }
+                        else if( bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) )
+                        {
+                                set_setstr( &ic->set, "group", ic->name + 1 );
+                                set_setstr( &ic->set, "fill_by", "group" );
+                        }
+                        else if( set_setstr( &ic->set, "protocol", ic->name + 1 ) )
+                        {
+                                set_setstr( &ic->set, "fill_by", "protocol" );
+                        }
+                        else if( set_setstr( &ic->set, "account", ic->name + 1 ) )
+                        {
+                                set_setstr( &ic->set, "fill_by", "account" );
+                        }
+                        else
+                        {
+                                bee_irc_channel_update( ic->irc, ic, NULL );
+                        }
+                }
                 
                 if( ic == NULL )
@@ -202 +226 @@
                 irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
         }
-        else if( irc_channel_del_user( ic, irc->user, FALSE, cmd[2] ) )
+        else if( irc_channel_del_user( ic, irc->user, IRC_CDU_PART, cmd[2] ) )
         {
                 if( ic->f->part )

irc_im.c

@@ -451 +451 @@
         irc_channel_t *ic = c->ui_data;
         
+        if( ic == NULL )
+                return FALSE;
+        
         if( ic->flags & IRC_CHANNEL_JOINED )
                 irc_channel_printf( ic, "Cleaning up channel, bye!" );
@@ -463 +466 @@
 {
         irc_channel_t *ic = c->ui_data;
+        
+        if( ic == NULL )
+                return FALSE;
         
         irc_channel_printf( ic, "%s", text );
@@ -476 +482 @@
         char *ts = NULL;
         
+        if( ic == NULL )
+                return FALSE;
+        
         if( sent_at > 0 && set_getbool( &bee->set, "display_timestamps" ) )
                 ts = irc_format_timestamp( irc, sent_at );
@@ -488 +497 @@
 {
         irc_t *irc = bee->ui_data;
-        
-        irc_channel_add_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data );
+        irc_channel_t *ic = c->ui_data;
+        
+        if( ic == NULL )
+                return FALSE;
+        
+        irc_channel_add_user( ic, bu == bee->user ? irc->user : bu->ui_data );
         
         return TRUE;
@@ -497 +510 @@
 {
         irc_t *irc = bee->ui_data;
+        irc_channel_t *ic = c->ui_data;
+        
+        if( ic == NULL )
+                return FALSE;
         
         /* TODO: Possible bug here: If a module removes $user here instead of just
            using imcb_chat_free() and the channel was IRC_CHANNEL_TEMP, we get into
            a broken state around here. */
-        irc_channel_del_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, NULL );
+        irc_channel_del_user( ic, bu == bee->user ? irc->user : bu->ui_data, IRC_CDU_PART, NULL );
         
         return TRUE;
@@ -508 +525 @@
 static gboolean bee_irc_chat_topic( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu )
 {
+        irc_channel_t *ic = c->ui_data;
         irc_t *irc = bee->ui_data;
         irc_user_t *iu;
+        
+        if( ic == NULL )
+                return FALSE;
         
         if( bu == NULL )
@@ -518 +539 @@
                 iu = bu->ui_data;
         
-        irc_channel_set_topic( c->ui_data, new, iu );
+        irc_channel_set_topic( ic, new, iu );
         
         return TRUE;
@@ -528 +549 @@
         irc_channel_t *ic = c->ui_data, *oic;
         char stripped[MAX_NICK_LENGTH+1], *full_name;
+        
+        if( ic == NULL )
+                return FALSE;
         
         /* Don't rename a channel if the user's in it already. */
@@ -786 +810 @@
 static gboolean bee_irc_channel_free( irc_channel_t *ic )
 {
+        struct groupchat *c = ic->data;
+        
         set_del( &ic->set, "account" );
         set_del( &ic->set, "chat_type" );
@@ -793 +819 @@
         
         ic->flags &= ~IRC_CHANNEL_TEMP;
+        
+        /* That one still points at this channel. Don't. */
+        if( c )
+                c->ui_data = NULL;
         
         return TRUE;