Changeset 3611717

Timestamp:

2008-08-31T15:00:35Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3b99524

Parents:

d995c9b

Message:

Added auto_join code.

Files:

• chat.c (modified) (2 diffs)
• chat.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (2 diffs)

chat.c

@@ -58 +58 @@
         
         s = set_add( &c->set, "auto_join", "false", set_eval_bool, c );
-        s = set_add( &c->set, "auto_rejoin", "false", set_eval_bool, c );
+        /* s = set_add( &c->set, "auto_rejoin", "false", set_eval_bool, c ); */
         s = set_add( &c->set, "nick", NULL, NULL, c );
         s->flags |= SET_NULL_OK;
@@ -169 +169 @@
                 return 0;
 }
+
+int chat_join( irc_t *irc, struct chat *c )
+{
+        struct groupchat *gc;
+        char *nick = set_getstr( &c->set, "nick" );
+        
+        if( nick == NULL )
+                nick = irc->nick;
+        
+        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, NULL ) ) )
+        {
+                g_free( gc->channel );
+                gc->channel = g_strdup( c->channel );
+                return 1;
+        }
+        
+        return 0;
+}

chat.h

@@ -43 +43 @@
 int chat_chancmp( char *a, char *b );
 int chat_chanok( char *a );
+
+int chat_join( irc_t *irc, struct chat *c );

irc_commands.c

@@ -193 +193 @@
         else if( cmd[1] )
         {
-                struct groupchat *gc;
                 struct chat *c;
                 user_t *u;
@@ -205 +204 @@
                 if( ( c = chat_bychannel( irc, cmd[1] ) ) )
                 {
-                        char *nick = set_getstr( &c->set, "nick" );
-                        
-                        if( nick == NULL )
-                                nick = irc->nick;
-                        
-                        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, NULL ) ) )
-                        {
-                                g_free( gc->channel );
-                                gc->channel = g_strdup( c->channel );
-                        }
+                        chat_join( irc, c );
                 }
                 else

protocols/nogaim.c

@@ -249 +249 @@
 void imcb_connected( struct im_connection *ic )
 {
+        irc_t *irc = ic->irc;
+        struct chat *c;
         user_t *u;
         
@@ -271 +273 @@
            exponential backoff timer. */
         ic->acc->auto_reconnect_delay = 0;
+        
+        for( c = irc->chatrooms; c; c = c->next )
+        {
+                if( c->acc != ic->acc )
+                        continue;
+                
+                if( set_getbool( &c->set, "auto_join" ) )
+                        chat_join( irc, c );
+        }
 }