Changeset 1c40aa7

Timestamp:

2010-06-28T00:07:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c7eb771

Parents:

134a02c

Message:

Mark nameless groupchat channels as temporary so they don't stick around
forever.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (5 diffs)
• storage_xml.c (modified) (1 diff)

irc.h

@@ -132 +132 @@
 typedef enum
 {
-        IRC_CHANNEL_JOINED = 1,
+        IRC_CHANNEL_JOINED = 1, /* The user is currently in the channel. */
+        IRC_CHANNEL_TEMP = 2,   /* Erase the channel when the user leaves,
+                                   and don't save it. */
         
         /* Hack: Set this flag right before jumping into IM when we expect

irc_channel.c

@@ -202 +202 @@
         
         if( iu == ic->irc->user )
+        {
                 ic->flags &= ~IRC_CHANNEL_JOINED;
+                
+                if( ic->flags & IRC_CHANNEL_TEMP )
+                        irc_channel_free( ic );
+        }
         
         return 1;

irc_im.c

@@ -455 +455 @@
                 irc_channel_printf( ic, "Cleaning up channel, bye!" );
         
-        /* irc_channel_free( ic ); */
-        
+        ic->data = NULL;
         irc_channel_del_user( ic, ic->irc->user, FALSE, "Chatroom closed by server" );
-        ic->data = NULL;
         
         return TRUE;
@@ -501 +499 @@
         irc_t *irc = bee->ui_data;
         
+        /* 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, FALSE, NULL );
         
@@ -696 +697 @@
 
 static char *set_eval_room_account( set_t *set, char *value );
+static char *set_eval_chat_type( set_t *set, char *value );
 
 static gboolean bee_irc_channel_init( irc_channel_t *ic )
 {
         set_add( &ic->set, "account", NULL, set_eval_room_account, ic );
-        set_add( &ic->set, "chat_type", "groupchat", NULL, ic );
+        set_add( &ic->set, "chat_type", "groupchat", set_eval_chat_type, ic );
         set_add( &ic->set, "nick", NULL, NULL, ic );
         set_add( &ic->set, "room", NULL, NULL, ic );
+        
+        /* chat_type == groupchat */
+        ic->flags |= IRC_CHANNEL_TEMP;
         
         return TRUE;
@@ -721 +726 @@
         
         return g_strdup_printf( "%s(%s)", acc->prpl->name, acc->user );
+}
+
+static char *set_eval_chat_type( set_t *set, char *value )
+{
+        struct irc_channel *ic = set->data;
+        
+        if( strcmp( value, "groupchat" ) == 0 )
+                ic->flags |= IRC_CHANNEL_TEMP;
+        else if( strcmp( value, "room" ) == 0 )
+                ic->flags &= ~IRC_CHANNEL_TEMP;
+        else
+                return NULL;
+        
+        return value;
 }
 
@@ -729 +748 @@
         set_del( &ic->set, "nick" );
         set_del( &ic->set, "room" );
+        
+        ic->flags &= ~IRC_CHANNEL_TEMP;
         
         return TRUE;

storage_xml.c

@@ -517 +517 @@
                 irc_channel_t *ic = l->data;
                 
+                if( ic->flags & IRC_CHANNEL_TEMP )
+                        continue;
+                
                 if( !xml_printf( fd, 1, "<channel name=\"%s\" type=\"%s\">\n",
                                  ic->name, set_getstr( &ic->set, "type" ) ) )