Changeset 31dbb90a

Timestamp:

2010-08-30T22:02:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4c737ebd, f5c0d8e

Parents:

fda55fa

Message:

Suppress subjects in Jabber conversations after showing them once.

Location:

protocols/jabber

Files:

• jabber.h (modified) (1 diff)
• message.c (modified) (1 diff)

protocols/jabber/jabber.h

@@ -59 +59 @@
         JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
                                            have a real JID. */
+        JBFLAG_HIDE_SUBJECT = 16,       /* Hide the subject field since we probably
+                                           showed it already. */
 } jabber_buddy_flags_t;
 

protocols/jabber/message.c

@@ -93 +93 @@
                         }
                 }
-                else if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 )
+                else if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 &&
+                         ( !bud || !( bud->flags & JBFLAG_HIDE_SUBJECT ) ) )
                 {
                         g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Message with subject: %s >>\n", c->text );
+                        if( bud )
+                                bud->flags |= JBFLAG_HIDE_SUBJECT;
+                }
+                else if( bud && !c )
+                {
+                        /* Yeah, possibly we're hiding changes to this field now. But nobody uses
+                           this for anything useful anyway, except GMail when people reply to an
+                           e-mail via chat, repeating the same subject all the time. I don't want
+                           to have to remember full subject strings for everyone. */
+                        bud->flags &= ~JBFLAG_HIDE_SUBJECT;
                 }