Changeset 2fe5eb9

Timestamp:

2010-07-29T17:08:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f7ca587

Parents:

b40e60d

Message:

Clean up references from irc_user structs to channels that are being free()d.

Files:

• irc.h (modified) (2 diffs)
• irc_channel.c (modified) (2 diffs)
• irc_im.c (modified) (2 diffs)

irc.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                *
   \********************************************************************/
 
@@ -108 +108 @@
         char *fullname;
         
-        /* Nickname in lowercase for case sensitive searches */
+        /* Nickname in lowercase for case insensitive searches */
         char *key;
         

irc_channel.c

@@ -117 +117 @@
 {
         irc_t *irc = ic->irc;
+        GSList *l;
         
         if( ic->flags & IRC_CHANNEL_JOINED )
@@ -132 +133 @@
                 g_free( ic->users->data );
                 ic->users = g_slist_remove( ic->users, ic->users->data );
+        }
+        
+        for( l = irc->users; l; l = l->next )
+        {
+                irc_user_t *iu = l->data;
+                
+                if( iu->last_channel == ic )
+                        iu->last_channel = irc->default_channel;
         }
         

irc_im.c

@@ -210 +210 @@
         char *dst, *prefix = NULL;
         char *wrapped, *ts = NULL;
+        irc_channel_t *ic = NULL;
         
         if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
@@ -216 +217 @@
         if( iu->last_channel )
         {
-                dst = iu->last_channel->name;
+                if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
+                        ic = iu->last_channel;
+                else if( irc->default_channel->flags & IRC_CHANNEL_JOINED )
+                        ic = irc->default_channel;
+        }
+        
+        if( ic )
+        {
+                dst = ic->name;
                 prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }