Changeset 94acdd0

Timestamp:

2008-09-28T11:18:19Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b2c062d

Parents:

e180c59

Message:

Restored support for password-protected chatrooms (for now only by accepting
a password in the IRC JOIN command).

Files:

• chat.c (modified) (2 diffs)
• chat.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/xmltree.c (modified) (1 diff)
• lib/xmltree.h (modified) (1 diff)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)

chat.c

@@ -170 +170 @@
 }
 
-int chat_join( irc_t *irc, struct chat *c )
+int chat_join( irc_t *irc, struct chat *c, const char *password )
 {
         struct groupchat *gc;
@@ -178 +178 @@
                 nick = irc->nick;
         
-        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, NULL ) ) )
+        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, password ) ) )
         {
                 g_free( gc->channel );

chat.h

@@ -44 +44 @@
 int chat_chanok( char *a );
 
-int chat_join( irc_t *irc, struct chat *c );
+int chat_join( irc_t *irc, struct chat *c, const char *password );

irc_commands.c

@@ -194 +194 @@
         {
                 struct chat *c;
-                user_t *u;
                 
                 if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 )
                         irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] );
                 else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic )
-                        chat_join( irc, c );
+                        chat_join( irc, c, cmd[2] );
                 else
                         irc_reply( irc, 403, "%s :No such channel", cmd[1] );

lib/xmltree.c

@@ -472 +472 @@
 }
 
-struct xt_node *xt_new_node( char *name, char *text, struct xt_node *children )
+struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children )
 {
         struct xt_node *node, *c;

lib/xmltree.h

@@ -90 +90 @@
 char *xt_find_attr( struct xt_node *node, const char *key );
 
-struct xt_node *xt_new_node( char *name, char *text, struct xt_node *children );
+struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );
 void xt_add_child( struct xt_node *parent, struct xt_node *child );
 void xt_add_attr( struct xt_node *node, const char *key, const char *value );

protocols/jabber/conference.c

@@ -26 +26 @@
 static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password )
+struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         struct jabber_chat *jc;

protocols/jabber/jabber.c

@@ -425 +425 @@
 }
 
-static struct groupchat *jabber_chat_join_( struct im_connection *ic, char *room, char *nick, char *password )
+static struct groupchat *jabber_chat_join_( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         if( strchr( room, '@' ) == NULL )

protocols/jabber/jabber.h

@@ -240 +240 @@
 
 /* conference.c */
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
+struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password );
 struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name );
 void jabber_chat_free( struct groupchat *c );

protocols/nogaim.c

@@ -280 +280 @@
                 
                 if( set_getbool( &c->set, "auto_join" ) )
-                        chat_join( irc, c );
+                        chat_join( irc, c, NULL );
         }
 }
@@ -710 +710 @@
 }
 
-struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle )
+struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle )
 {
         struct groupchat *c;

protocols/nogaim.h

@@ -209 +209 @@
          * not implement this. */
         struct groupchat *
-             (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
+             (* chat_join)      (struct im_connection *, const char *room, const char *nick, const char *password);
         /* Change the topic, if supported. Note that BitlBee expects the IM
            server to confirm the topic change with a regular topic change
@@ -290 +290 @@
  *   the user her/himself. At that point the group chat will be visible to the
  *   user, too. */
-G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */

protocols/oscar/oscar.c

@@ -2581 +2581 @@
 }
 
-struct groupchat *oscar_chat_join(struct im_connection * ic, char * room, char * nick, char * password )
+struct groupchat *oscar_chat_join(struct im_connection * ic, const char * room, const char * nick, const char * password )
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;