diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-12-02 17:25:57 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-12-02 17:25:57 +0000 |
| commit | 5bd21df87b195af211c2280ca00391493a669895 (patch) | |
| tree | eae5eed57bfd4ce4b9ec5f3c3a0ebbf9f37be632 /protocols/jabber/presence.c | |
| parent | 911cc4f16e96c1ea9027bb12b024531a4b588038 (diff) | |
Handling of presence-error packets (only useful for groupchats now), moved
jabber_chat_by_jid() (with the right name) to conference.c, I don't know
what it was doing in jabber_util.c.
Diffstat (limited to 'protocols/jabber/presence.c')
| -rw-r--r-- | protocols/jabber/presence.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/protocols/jabber/presence.c b/protocols/jabber/presence.c index 5abdc449..c3d7dced 100644 --- a/protocols/jabber/presence.c +++ b/protocols/jabber/presence.c @@ -39,7 +39,7 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data ) if( ( s = strchr( from, '/' ) ) ) { *s = 0; - if( jabber_chat_by_name( ic, from ) ) + if( jabber_chat_by_jid( ic, from ) ) is_chat = 1; *s = '/'; } @@ -163,8 +163,10 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data ) } else if( strcmp( type, "error" ) == 0 ) { - struct jabber_error *err; + return jabber_cache_handle_packet( ic, node ); + /* + struct jabber_error *err; if( ( c = xt_find_node( node->children, "error" ) ) ) { err = jabber_error_parse( c, XMLNS_STANZA_ERROR ); @@ -172,8 +174,7 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data ) err->code, err->text ? ": " : "", err->text ? err->text : "" ); jabber_error_free( err ); - } - /* What else to do with it? */ + } */ } return XT_HANDLED; |