Changeset 975708a for protocols

Timestamp:

2010-09-05T12:08:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2c6b0f4

Parents:

4e1be76 (diff), ed320e8 (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:

Mainline merge.

Location:

protocols

Files:

• jabber/conference.c (modified) (2 diffs)
• jabber/jabber.h (modified) (1 diff)
• jabber/message.c (modified) (1 diff)
• oscar/oscar.c (modified) (1 diff)
• oscar/ssi.c (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -312 +312 @@
         char *s;
         
+        if( subject && chat )
+        {
+                s = bud ? strchr( bud->ext_jid, '/' ) : NULL;
+                if( s ) *s = 0;
+                imcb_chat_topic( chat, bud ? bud->ext_jid : NULL, subject->text_len > 0 ?
+                                 subject->text : NULL, jabber_get_timestamp( node ) );
+                if( s ) *s = '/';
+        }
+        
         if( bud == NULL || ( jc && ~jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me ) )
         {
@@ -366 +375 @@
                 return;
         }
-        
-        if( subject )
-        {
-                s = strchr( bud->ext_jid, '/' );
-                if( s ) *s = 0;
-                imcb_chat_topic( chat, bud->ext_jid, subject->text_len > 0 ?
-                                 subject->text : NULL, jabber_get_timestamp( node ) );
-                if( s ) *s = '/';
-        }
         if( body && body->text_len > 0 )
         {

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;
                 }
                 

protocols/oscar/oscar.c

@@ -517 +517 @@
                         /* Incorrect nick/password */
                         imcb_error(ic, _("Incorrect nickname or password."));
+                        {
+                                int max = od->icq ? 8 : 16;
+                                if (strlen(ic->acc->pass) > max)
+                                        imcb_log(ic, "Note that the maximum password "
+                                                 "length supported by this protocol is "
+                                                 "%d characters, try logging in using "
+                                                 "a shorter password.", max);
+                        }
 //                      plugin_event(event_error, (void *)980, 0, 0, 0);
                         break;

protocols/oscar/ssi.c

@@ -415 +415 @@
                 if (!parentgroup) {
                         char *newgroup;
-                        newgroup = (char*)g_malloc(strlen("Unknown")*sizeof(char));
+                        newgroup = (char*)g_malloc(strlen("Unknown")+1);
                         strcpy(newgroup, "Unknown");
                         aim_ssi_addgroups(sess, conn, &newgroup, 1);

protocols/twitter/twitter.c

@@ -195 +195 @@
         s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
         
-        s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
+        s = set_add( &acc->set, "mode", "chat", set_eval_mode, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;