Changeset b9f8b87 for protocols/jabber/message.c

Timestamp:

2007-07-01T16:29:21Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9c9b37c

Parents:

2758cfe

Message:

Better handling of private messages via groupchats.

File:

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

protocols/jabber/message.c

@@ -53 +53 @@
                 {
                         if( bud )
+                        {
                                 bud->last_act = time( NULL );
+                                from = bud->ext_jid ? : bud->bare_jid;
+                        }
                         else
                                 *s = 0; /* We need to generate a bare JID now. */
@@ -81 +84 @@
                 
                 if( fullmsg->len > 0 )
-                        imcb_buddy_msg( ic, bud ? bud->bare_jid : from, fullmsg->str,
+                        imcb_buddy_msg( ic, from, fullmsg->str,
                                         0, jabber_get_timestamp( node ) );
                 
@@ -90 +93 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_TYPING );
+                        imcb_buddy_typing( ic, from, OPT_TYPING );
                 }
                 /* No need to send a "stopped typing" signal when there's a message. */
@@ -96 +99 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, 0 );
+                        imcb_buddy_typing( ic, from, 0 );
                 }
                 else if( xt_find_node( node->children, "paused" ) )
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_THINKING );
+                        imcb_buddy_typing( ic, from, OPT_THINKING );
                 }