[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.63,1.64

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory subversions:/tmp/cvs-serv12892/modules/msn2

Modified Files:
        msn.C 
Log Message:
use friendlynames when possible


Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- msn.C       28 Feb 2003 10:51:46 -0000      1.63
+++ msn.C       5 Mar 2003 13:42:05 -0000       1.64
@@ -1719,7 +1719,8 @@
 
   eb_join_chat_room(ecr);
 
-  eb_chat_room_buddy_arrive(ecr, ((authdata_SB *)conn->auth)->username,  
((authdata_SB *)conn->auth)->username);
+  eb_chat_room_buddy_arrive(ecr, fname_pref[0]!=0 ? fname_pref:((authdata_SB 
*)conn->auth)->username,  
+                                ((authdata_SB *)conn->auth)->username);
 
 
   eb_debug(DBG_MSN, "Got switchboard connection\n");
@@ -1759,11 +1760,15 @@
 
       while(l!=NULL)
       {
-        eb_chat_room_buddy_arrive(ecr, ((char_data *)l->data)->c, ((char_data 
*)l->data)->c);
+       eb_account *acc = NULL;
+       acc = find_account_by_handle(((char_data 
*)l->data)->c,SERVICE_INFO.protocol_id);
+        eb_chat_room_buddy_arrive(ecr, 
acc?acc->account_contact->nick:((char_data *)l->data)->c, 
+                                      ((char_data *)l->data)->c);
         l=l->next;
       }
 
-      eb_chat_room_buddy_arrive(ecr, ((authdata_SB *)conn->auth)->username,  
((authdata_SB *)conn->auth)->username);
+      eb_chat_room_buddy_arrive(ecr,   
fname_pref[0]!=0?fname_pref:((authdata_SB *)conn->auth)->username,  
+                                       ((authdata_SB *)conn->auth)->username);
     } else {
       llist * l=pending_file_sends;
 
@@ -1796,10 +1801,10 @@
     }
   } else {
     eb_debug(DBG_MSN, "Ordinary chat arrival\n");
-    eb_chat_room_buddy_arrive(ecr, username, username);
+    eb_chat_room_buddy_arrive(ecr, friendlyname, username);
   }
 
-  eb_debug(DBG_MSN, "%s (%s) is now in the session\n", friendlyname, username);
+  eb_debug(DBG_MSN, "%s (%s) is now in the session\n", 
Utf8ToStr(friendlyname), username);
 }
 
 void ext_user_left(msnconn * conn, char * username)