Changeset ab6006c

Timestamp:

2010-06-28T09:03:39Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a670aeb

Parents:

c7eb771

Message:

Callers shouldn't have to expect that irc_channel_del_user() frees the channel
so if it wants to (temporary channels), do it via a timer.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (2 diffs)

irc.h

@@ -229 +229 @@
 irc_channel_t *irc_channel_get( irc_t *irc, char *id );
 int irc_channel_free( irc_channel_t *ic );
+void irc_channel_free_soon( irc_channel_t *ic );
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, const char *msg );

irc_channel.c

@@ -141 +141 @@
 }
 
+struct irc_channel_free_data
+{
+        irc_t *irc;
+        irc_channel_t *ic;
+        char *name;
+};
+
+static gboolean irc_channel_free_callback( gpointer data, gint fd, b_input_condition cond )
+{
+        struct irc_channel_free_data *d = data;
+        
+        if( g_slist_find( irc_connection_list, d->irc ) &&
+            irc_channel_by_name( d->irc, d->name ) == d->ic &&
+            !( d->ic->flags & IRC_CHANNEL_JOINED ) )
+                irc_channel_free( d->ic );
+
+        g_free( d->name );
+        g_free( d );
+        return FALSE;
+}
+
+/* Free the channel, but via the event loop, so after finishing whatever event
+   we're currently handling. */
+void irc_channel_free_soon( irc_channel_t *ic )
+{
+        struct irc_channel_free_data *d = g_new0( struct irc_channel_free_data, 1 );
+        
+        d->irc = ic->irc;
+        d->ic = ic;
+        d->name = g_strdup( ic->name );
+        
+        b_timeout_add( 0, irc_channel_free_callback, d );
+}
+
 static char *set_eval_channel_type( set_t *set, char *value )
 {
@@ -206 +240 @@
                 
                 if( ic->flags & IRC_CHANNEL_TEMP )
-                        irc_channel_free( ic );
+                        irc_channel_free_soon( ic );
         }