|
发表于 2006-5-10 20:35:57
|
显示全部楼层
好像和登录的补丁有冲突,冲突如下:
cat qq.h.rej
***************
*** 65,71 ****
guint8 status; //
gboolean logged_in; // used by qq-add_buddy
gboolean use_tcp; // network in tcp or udp
!
GaimProxyType proxy_type; // proxy type
GaimXfer *xfer; // file transfer handler
struct sockaddr_in dest_sin;
--- 66,75 ----
guint8 status; //
gboolean logged_in; // used by qq-add_buddy
gboolean use_tcp; // network in tcp or udp
! //modify by Yuan Qingyun
! guint8 token_len; //login token length
! guint8 * ptoken; //login token
! guint8 * pGroupUnknown;
GaimProxyType proxy_type; // proxy type
GaimXfer *xfer; // file transfer handler
struct sockaddr_in dest_sin; |
|