Changeset 3e7b640

Timestamp:

2009-11-28T00:47:20Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5674207

Parents:

487f555

Message:

Look up a buddy in the contact list on incoming msgs. This seems to be
the best way to "normalize" handles (i.e. chopping off the resource part
of JIDs).

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -380 +380 @@
 static void prplcb_blist_remove( PurpleBuddyList *list, PurpleBlistNode *node )
 {
+        /*
         PurpleBuddy *bud = (PurpleBuddy*) node;
         
-        /*
         if( node->type == PURPLE_BLIST_BUDDY_NODE )
         {
@@ -407 +407 @@
 {
         struct im_connection *ic = purple_ic_by_pa( conv->account );
+        PurpleBuddy *buddy;
         
         /* ..._SEND means it's an outgoing message, no need to echo those. */
-        if( !( flags & PURPLE_MESSAGE_SEND ) )
-                imcb_buddy_msg( ic, (char*) who, (char*) message, 0, mtime );
+        if( flags & PURPLE_MESSAGE_SEND )
+                return;
+        
+        buddy = purple_find_buddy( conv->account, who );
+        if( buddy != NULL )
+                who = purple_buddy_get_contact_alias( buddy );
+        
+        imcb_buddy_msg( ic, (char*) who, (char*) message, 0, mtime );
 }