Changeset 63075d7 for protocols/jabber/conference.c

Timestamp:

2008-02-03T23:33:18Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

69ac78c

Parents:

8ff0a61

Message:

Messages from the user are also included in backlogs when joining a Jabber
chatroom. Until now they were ignored, which might make backlogs a little
bit confusing.

File:

• protocols/jabber/conference.c (modified) (3 diffs)

protocols/jabber/conference.c

@@ -122 +122 @@
         struct jabber_chat *jc = c->data;
         struct xt_node *node;
+        
+        jc->flags |= JCFLAG_MESSAGE_SENT;
         
         node = xt_new_node( "body", message, NULL );
@@ -295 +297 @@
         struct xt_node *subject = xt_find_node( node->children, "subject" );
         struct xt_node *body = xt_find_node( node->children, "body" );
-        struct groupchat *chat = NULL;
+        struct groupchat *chat = bud ? jabber_chat_by_jid( ic, bud->bare_jid ) : NULL;
+        struct jabber_chat *jc = chat ? chat->data : NULL;
         char *s;
         
-        if( bud == NULL )
+        if( bud == NULL || ( jc && ~jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me ) )
         {
                 char *nick;
@@ -346 +349 @@
                 return;
         }
-        else if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
+        else if( chat == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )