Changeset e35d1a1 for protocols/jabber/presence.c

Timestamp:

2007-04-22T20:44:27Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

43671b9

Parents:

c737ba7

Message:

Read-only support for Jabber conferences (non-anonymous rooms only).
Just don't use this, you're really not going to like it. :-)

File:

• protocols/jabber/presence.c (modified) (5 diffs)

protocols/jabber/presence.c

@@ -31 +31 @@
         struct xt_node *c;
         struct jabber_buddy *bud;
+        int is_chat = 0;
         char *s;
         
         if( !from )
                 return XT_HANDLED;
+        
+        if( ( s = strchr( from, '/' ) ) )
+        {
+                *s = 0;
+                if( jabber_chat_by_name( ic, from ) )
+                        is_chat = 1;
+                *s = '/';
+        }
         
         if( type == NULL )
@@ -72 +81 @@
                         bud->priority = 0;
                 
-                if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
+                if( is_chat )
+                        jabber_chat_pkt_presence( ic, bud, node );
+                else if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
                         imcb_buddy_status( ic, bud->bare_jid, OPT_LOGGED_IN | is_away,
                                            ( is_away && bud->away_state ) ? bud->away_state->full_name : NULL,
@@ -79 +90 @@
         else if( strcmp( type, "unavailable" ) == 0 )
         {
-                if( jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) == NULL )
+                if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) == NULL )
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
@@ -86 +97 @@
                 }
                 
+                /* Handle this before we delete the JID. */
+                if( is_chat )
+                {
+                        jabber_chat_pkt_presence( ic, bud, node );
+                }
+                
                 jabber_buddy_remove( ic, from );
                 
-                if( ( s = strchr( from, '/' ) ) )
+                if( is_chat )
+                {
+                        /* Nothing else to do for now? */
+                }
+                else if( ( s = strchr( from, '/' ) ) )
                 {
                         *s = 0;
@@ -96 +117 @@
                         if( jabber_buddy_by_jid( ic, from, 0 ) == NULL )
                                 imcb_buddy_status( ic, from, 0, NULL, NULL );
+                        /* FIXME: If this resource was not away and another resource is,
+                           we should definitely send an update here. */
                         
                         *s = '/';