From: Christian H. <ch...@us...> - 2003-09-15 02:24:02
|
Update of /cvsroot/gaim/gaim/src/protocols/msn In directory sc8-pr-cvs1:/tmp/cvs-serv24625 Modified Files: Makefile.am switchboard.c switchboard.h Removed Files: buddyicon.c buddyicon.h Log Message: Removed the old buddy icon code from MSN. Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -p -r1.19 -r1.20 --- Makefile.am 2 Sep 2003 04:32:16 -0000 1.19 +++ Makefile.am 15 Sep 2003 02:23:58 -0000 1.20 @@ -6,8 +6,6 @@ EXTRA_DIST = \ pkgdir = $(libdir)/gaim MSNSOURCES = \ - buddyicon.c \ - buddyicon.h \ dispatch.c \ dispatch.h \ error.c \ Index: switchboard.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -p -r1.41 -r1.42 --- switchboard.c 14 Sep 2003 22:00:11 -0000 1.41 +++ switchboard.c 15 Sep 2003 02:23:58 -0000 1.42 @@ -36,9 +36,6 @@ send_clientcaps(MsnSwitchBoard *swboard) { MsnMessage *msg; - if (swboard->buddy_icon_xfer != NULL) - return TRUE; - msg = msn_message_new(); msn_message_set_content_type(msg, "text/x-clientcaps"); msn_message_set_charset(msg, NULL); @@ -382,6 +379,7 @@ control_msg(MsnServConn *servconn, MsnMe static gboolean clientcaps_msg(MsnServConn *servconn, MsnMessage *msg) { +#if 0 MsnSession *session = servconn->session; MsnSwitchBoard *swboard = servconn->data; MsnUser *user; @@ -391,12 +389,7 @@ clientcaps_msg(MsnServConn *servconn, Ms user = msn_user_new(session, servconn->msg_passport, NULL); clientcaps = msn_message_get_hashtable_from_body(msg); - - if (swboard->chat == NULL && session->protocol_ver < 8) - { - if ((value = g_hash_table_lookup(clientcaps, "Buddy-Icons")) != NULL) - msn_buddy_icon_invite(swboard); - } +#endif return TRUE; } @@ -493,8 +486,6 @@ msn_switchboard_new(MsnSession *session) clientcaps_msg); msn_servconn_register_msg_type(servconn, "text/x-clientinfo", clientcaps_msg); - msn_servconn_register_msg_type(servconn, "application/x-buddyicon", - msn_buddy_icon_msg); msn_servconn_register_msg_type(servconn, "application/x-msnmsgrp2p", msn_p2p_msg); Index: switchboard.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -p -r1.7 -r1.8 --- switchboard.h 7 Sep 2003 22:35:00 -0000 1.7 +++ switchboard.h 15 Sep 2003 02:23:58 -0000 1.8 @@ -26,7 +26,6 @@ typedef struct _MsnSwitchBoard MsnSwitch #include "conversation.h" -#include "buddyicon.h" #include "msg.h" #include "msnslp.h" #include "servconn.h" @@ -57,8 +56,6 @@ struct _MsnSwitchBoard gboolean hidden; MsnSlpSession *slp_session; - - MsnBuddyIconXfer *buddy_icon_xfer; }; /** --- buddyicon.c DELETED --- --- buddyicon.h DELETED --- |