Changeset f5c0d8e for protocols/jabber

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline stuff.

Location:

protocols/jabber

Files:

• Makefile (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• message.c (modified) (4 diffs)
• si.c (modified) (1 diff)

protocols/jabber/Makefile

@@ -30 +30 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -42 +43 @@
         @echo '*' Linking jabber_mod.o
         @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
+
+-include .depend/*.d

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

@@ -31 +31 @@
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
         struct jabber_buddy *bud = NULL;
-        char *s;
+        char *s, *room = NULL, *reason = NULL;
         
         if( !from )
@@ -52 +52 @@
                 for( c = node->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
                 {
-                        char *ns = xt_find_attr( c, "xmlns" ), *room;
-                        struct xt_node *inv, *reason;
+                        char *ns = xt_find_attr( c, "xmlns" );
+                        struct xt_node *inv;
                         
                         if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {
+                                /* This is an invitation. Set some vars which
+                                   will be passed to imcb_chat_invite() below. */
                                 room = from;
                                 if( ( from = xt_find_attr( inv, "from" ) ) == NULL )
                                         from = room;
-
-                                g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
-                                if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
-                                        g_string_append( fullmsg, reason->text );
+                                if( ( inv = xt_find_node( inv->children, "reason" ) ) && inv->text_len > 0 )
+                                        reason = inv->text;
                         }
                 }
@@ -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;
                 }
                 
@@ -104 +115 @@
                         imcb_buddy_msg( ic, from, fullmsg->str,
                                         0, jabber_get_timestamp( node ) );
+                if( room )
+                        imcb_chat_invite( ic, room, from, reason );
                 
                 g_string_free( fullmsg, TRUE );

protocols/jabber/si.c

@@ -262 +262 @@
                                 break;
                         }
+                        else
+                        {
+                                c = c->next;
+                        }
 
                 if ( !requestok )