Oops, even BitlBee didn't know yet that channel names can start with &. Now it should.

2 files changed, 4 insertions, 4 deletions

diff --git a/irc.c b/irc.c
index 60fe77f8..f0007344 100644
--- a/irc.c
+++ b/irc.c
@@ -485,7 +485,7 @@ int irc_exec( irc_t *irc, char **cmd )
 		{
 			irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
 		}
-		else if( *cmd[1] == '#' )
+		else if( *cmd[1] == '#' || *cmd[1] == '&' )
 		{
 			if( cmd[2] )
 			{
@@ -556,7 +556,7 @@ int irc_exec( irc_t *irc, char **cmd )
 			     RFC doesn't have any reply for that though? */
 		else if( cmd[1] )
 		{
-			if( cmd[1][0] == '#' && cmd[1][1] )
+			if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] )
 			{
 				user_t *u = user_find( irc, cmd[1] + 1 );
 				
@@ -1324,7 +1324,7 @@ int irc_send( irc_t *irc, char *nick, char *s, int flags )
 	struct conversation *c = NULL;
 	user_t *u = NULL;
 	
-	if( *nick == '#' )
+	if( *nick == '#' || *nick == '&' )
 	{
 		if( !( c = conv_findchannel( nick ) ) )
 		{
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index f4a2ecb3..22240d8a 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -770,7 +770,7 @@ struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, c
 	c->title = g_strdup( handle );
 	
 	s = g_new( char, 16 );
-	sprintf( s, "#chat_%03d", gc->irc->c_id++ );
+	sprintf( s, "&chat_%03d", gc->irc->c_id++ );
 	c->channel = g_strdup( s );
 	g_free( s );