Changeset 5a75d15 for root_commands.c

Timestamp:

2010-06-05T22:32:36Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c1a8a16

Parents:

f5d87ea

Message:

Chatroom improvements. Merged chatroom stub into normal chatroom stuff,
restored "chat add" behaviour a little bit better (don't clean up a
channel when its room disappears, just disconnect it from the groupchat).

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -980 +980 @@
                         return;
                 }
+                else if( !acc->prpl->chat_join )
+                {
+                        irc_usermsg( irc, "Named chatrooms not supported on that account." );
+                        return;
+                }
                 
                 if( cmd[4] == NULL )
@@ -999 +1004 @@
                 }
                 
-                if( ( ic = irc_channel_new( irc, channel ) ) )
-                {
-                        struct irc_groupchat_stub *igs;
+                if( ( ic = irc_channel_new( irc, channel ) ) &&
+                    set_setstr( &ic->set, "chat_type", "room" ) &&
+                    set_setstr( &ic->set, "account", cmd[2] ) &&
+                    set_setstr( &ic->set, "room", cmd[3] ) )
+                {
+                        irc_usermsg( irc, "Chatroom successfully added." );
+                }
+                else
+                {
+                        if( ic )
+                                irc_channel_free( ic );
                         
-                        ic->data = igs = g_new0( struct irc_groupchat_stub, 1 );
-                        igs->acc = acc;
-                        igs->room = g_strdup( cmd[3] );
+                        irc_usermsg( irc, "Could not add chatroom." );
                 }
         }