diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/jabber/conference.c | 4 | ||||
| -rw-r--r-- | protocols/nogaim.c | 18 | ||||
| -rw-r--r-- | protocols/nogaim.h | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c index 397fad85..c16236b3 100644 --- a/protocols/jabber/conference.c +++ b/protocols/jabber/conference.c @@ -101,7 +101,7 @@ int jabber_chat_leave( struct groupchat *c, const char *reason ) } /* Not really the same syntax as the normal pkt_ functions, but this isn't - called by the xmltree parser exactly and this way I can add some extra + called by the xmltree parser directly and this way I can add some extra parameters so we won't have to repeat too many things done by the caller already. */ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node ) @@ -150,7 +150,7 @@ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bu imcb_chat_add_buddy( chat, bud->orig_jid ); if( s ) *s = '/'; } - else if( type ) /* This only gets called if type=="unavailable" */ + else if( type ) /* This only gets called if type is NULL or "unavailable" */ { /* Won't handle this for now. */ if( bud->orig_jid == NULL ) diff --git a/protocols/nogaim.c b/protocols/nogaim.c index f3dbb0b8..5b1c4346 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -855,24 +855,6 @@ static int remove_chat_buddy_silent( struct groupchat *b, char *handle ) /* Misc. BitlBee stuff which shouldn't really be here */ -struct groupchat *chat_by_channel( char *channel ) -{ - struct im_connection *ic; - struct groupchat *c; - GSList *l; - - /* This finds the connection which has a conversation which belongs to this channel */ - for( l = connections; l; l = l->next ) - { - ic = l->data; - for( c = ic->groupchats; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next ); - if( c ) - return c; - } - - return NULL; -} - char *set_eval_away_devoice( set_t *set, char *value ) { irc_t *irc = set->data; diff --git a/protocols/nogaim.h b/protocols/nogaim.h index b26cf73e..4eb5cea1 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -206,7 +206,6 @@ G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle ); G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason ); G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at ); G_MODULE_EXPORT void imcb_chat_free( struct groupchat *c ); -struct groupchat *chat_by_channel( char *channel ); /* Actions, or whatever. */ int imc_set_away( struct im_connection *ic, char *away ); |