Changeset 7a6ba50

Timestamp:

2010-06-29T23:44:17Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

217bf4e

Parents:

58646d9

Message:

Also allow selecting contacts for a channel by protocol instead of account.
If someone has two MSN accts and wants contacts from both in one channel,
this is now possible.

Files:

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

irc.h

@@ -193 +193 @@
         IRC_CC_TYPE_GROUP,
         IRC_CC_TYPE_ACCOUNT,
+        IRC_CC_TYPE_PROTOCOL,
 } irc_control_channel_type_t;
 
@@ -200 +201 @@
         struct bee_group *group;
         struct account *account;
+        struct prpl *protocol;
 };
 

irc_channel.c

@@ -474 +474 @@
 static char *set_eval_fill_by( set_t *set, char *value );
 static char *set_eval_by_group( set_t *set, char *value );
+static char *set_eval_by_protocol( set_t *set, char *value );
 
 static gboolean control_channel_init( irc_channel_t *ic )
@@ -482 +483 @@
         set_add( &ic->set, "fill_by", "all", set_eval_fill_by, ic );
         set_add( &ic->set, "group", NULL, set_eval_by_group, ic );
+        set_add( &ic->set, "protocol", NULL, set_eval_by_protocol, ic );
         
         ic->data = icc = g_new0( struct irc_control_channel, 1 );
@@ -515 +517 @@
         if( icc->type == IRC_CC_TYPE_ACCOUNT )
                 bee_irc_channel_update( ic->irc, ic, NULL );
+        
         return g_strdup_printf( "%s(%s)", acc->prpl->name, acc->user );
 }
@@ -531 +534 @@
         else if( strcmp( value, "account" ) == 0 )
                 icc->type = IRC_CC_TYPE_ACCOUNT;
+        else if( strcmp( value, "protocol" ) == 0 )
+                icc->type = IRC_CC_TYPE_PROTOCOL;
         else
                 return SET_INVALID;
@@ -546 +551 @@
         if( icc->type == IRC_CC_TYPE_GROUP )
                 bee_irc_channel_update( ic->irc, ic, NULL );
+        
         return g_strdup( icc->group->name );
+}
+
+static char *set_eval_by_protocol( set_t *set, char *value )
+{
+        struct irc_channel *ic = set->data;
+        struct irc_control_channel *icc = ic->data;
+        struct prpl *prpl;
+        
+        if( !( prpl = find_protocol( value ) ) )
+                return SET_INVALID;
+        
+        icc->protocol = prpl;
+        if( icc->type == IRC_CC_TYPE_PROTOCOL )
+                bee_irc_channel_update( ic->irc, ic, NULL );
+        
+        return value;
 }
 

irc_im.c

@@ -157 +157 @@
         else if( icc->type == IRC_CC_TYPE_ACCOUNT )
                 show = iu->bu->ic->acc == icc->account;
+        else if( icc->type == IRC_CC_TYPE_PROTOCOL )
+                show = iu->bu->ic->acc->prpl == icc->protocol;
         
         if( !show )

storage_xml.c

@@ -219 +219 @@
                 }
                 
+                /* The channel may exist already, for example if it's &bitlbee.
+                   Also, it's possible that the user just reconnected and the
+                   IRC client already rejoined all channels it was in. They
+                   should still get the right settings. */
                 if( ( xd->current_channel = irc_channel_by_name( irc, name ) ) ||
                     ( xd->current_channel = irc_channel_new( irc, name ) ) )