Changeset a21a8ac for protocols/jabber/jabber.c

Timestamp:

2006-10-10T12:05:42Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8eb10c9

Parents:

6a1128d

Message:

Added resource selection (based on priority or time of last message) to
budd_by_jid(), added a full_jid property to easily address that resource
without having to rebuild the full JID every time and implemented typing
notification shite.

File:

• protocols/jabber/jabber.c (modified) (4 diffs)

protocols/jabber/jabber.c

@@ -44 +44 @@
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "resource_select", "priority", NULL, acc );
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
@@ -137 +139 @@
 static int jabber_send_im( struct gaim_connection *gc, char *who, char *message, int len, int away )
 {
+        struct jabber_data *jd = gc->proto_data;
+        struct jabber_buddy *bud;
         struct xt_node *node;
         int st;
         
-        /*
-        event = xt_new_node( "active", NULL, NULL );
-        xt_add_attr( event, "xlmns", "http://jabber.org/protocol/chatstates" );
-        
-        event = xt_new_node( "x", NULL, xt_new_node( "composing", NULL, NULL ) );
-        xt_add_attr( event, "xmlns", "jabber:x:event" );
-        */
+        bud = jabber_buddy_by_jid( gc, who );
         
         node = xt_new_node( "body", message, NULL );
-        node = jabber_make_packet( "message", "chat", who, node );
+        node = jabber_make_packet( "message", "chat", bud->full_jid, node );
+        
+        if( ( jd->flags & JFLAG_WANT_TYPING ) &&
+            ( ( bud->flags & JBFLAG_DOES_JEP85 ) ||
+             !( bud->flags & JBFLAG_PROBED_JEP85 ) ) )
+        {
+                struct xt_node *act;
+                
+                /* If the user likes typing notification and if we don't know
+                   (and didn't probe before) if this resource supports JEP85,
+                   include a probe in this packet now. */
+                act = xt_new_node( "active", NULL, NULL );
+                xt_add_attr( act, "xmlns", "http://jabber.org/protocol/chatstates" );
+                xt_add_child( node, act );
+                
+                /* Just make sure we do this only once. */
+                bud->flags |= JBFLAG_PROBED_JEP85;
+        }
+        
         st = jabber_write_packet( gc, node );
         xt_free_node( node );
@@ -227 +243 @@
            is in the cache for about a minute (which should be enough AFAIK). */
         jabber_cache_clean( gc );
+}
+
+static int jabber_send_typing( struct gaim_connection *gc, char *who, int typing )
+{
+        struct jabber_data *jd = gc->proto_data;
+        struct jabber_buddy *bud;
+        
+        /* Enable typing notification related code from now. */
+        jd->flags |= JFLAG_WANT_TYPING;
+        
+        bud = jabber_buddy_by_jid( gc, who );
+        if( bud->flags & JBFLAG_DOES_JEP85 )
+        {
+                /* We're only allowed to send this stuff if we know the other
+                   side supports it. */
+                
+                struct xt_node *node;
+                char *type;
+                int st;
+                
+                if( typing == 0 )
+                        type = "active";
+                else if( typing == 2 )
+                        type = "paused";
+                else /* if( typing == 1 ) */
+                        type = "composing";
+                
+                node = xt_new_node( type, NULL, NULL );
+                xt_add_attr( node, "xmlns", "http://jabber.org/protocol/chatstates" );
+                node = jabber_make_packet( "message", "chat", bud->full_jid, node );
+                
+                st = jabber_write_packet( gc, node );
+                xt_free_node( node );
+                
+                return st;
+        }
+        
+        return 1;
 }
 
@@ -250 +304 @@
 //      ret->chat_open = jabber_chat_open;
         ret->keepalive = jabber_keepalive;
-//      ret->send_typing = jabber_send_typing;
+        ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;