Menu
▾
▴
[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 Makefile.am, 1.7, 1.8 msn-account.h, 1.6, 1.7 msn-commands.c, 1.7, 1.8 msn-contacts.c, 1.9, 1.10 msn-contacts.h, 1.5, 1.6
|
From: Siddhesh P. <sid...@us...> - 2009-09-06 18:23:50
|
Update of /cvsroot/ayttm/ayttm/modules/msn2/libmsn2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12886/modules/msn2/libmsn2 Modified Files: Makefile.am msn-account.h msn-commands.c msn-contacts.c msn-contacts.h Log Message: * MSN: Added missing headers in Makefile.am * MSN: Response to FQY (Federated Queries) * MSN: Clean up. Third party messenger buddies have type 1 << 5. * CORE: Replaced status_pixmap with status_pixbuf in irc and aim-oscar * CORE: Removed deprecated icq, aim-toc and icq-toc from build * CORE: Updated plugin writing howto with status_pixbuf instead of status_pixmap * CORE: Updated messages in .po files * CORE: Fixed some build warnings * SMTP: Fixed build failure. It still won't work though Index: Makefile.am =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.am 14 Aug 2009 12:55:30 -0000 1.7 +++ Makefile.am 6 Sep 2009 18:23:08 -0000 1.8 @@ -1,12 +1,11 @@ noinst_LTLIBRARIES = libmsn2.la -EXTRA_DIST = md5.h msn_bittybits.h msn_core.h msn_interface.h - libmsn2_la_SOURCES = msn.c msn-connection.c msn-http.c msn-message.c msn-commands.c \ msn-soap.c msn-contacts.c msn-login.c msn-util.c msn-sb.c msn-errors.c noinst_HEADERS = msn.h msn-connection.h msn-message.h msn-soap.h msn-http.h \ - msn-login.h msn-util.h msn-sb.h + msn-login.h msn-util.h msn-sb.h msn-account.h msn-ext.h msn-contacts.h \ + msn-errors.h AM_CFLAGS = $(EB_CFLAGS) $(DEBUG_LIBMSN) AM_CXXFLAGS = $(EB_CFLAGS) Index: msn-account.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn-account.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- msn-account.h 30 Aug 2009 14:55:58 -0000 1.6 +++ msn-account.h 6 Sep 2009 18:23:08 -0000 1.7 @@ -55,7 +55,7 @@ typedef enum { MSN_BUDDY_PASSPORT = 1, - MSN_BUDDY_EMAIL = 1 << 1, + MSN_BUDDY_EMAIL = 1 << 5, /* At least for yahoo. Would probably be different for something else */ } MsnBuddyType; struct _MsnBuddy { Index: msn-commands.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn-commands.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- msn-commands.c 6 Sep 2009 13:11:04 -0000 1.7 +++ msn-commands.c 6 Sep 2009 18:23:08 -0000 1.8 @@ -168,7 +168,61 @@ static void msn_command_parse_payload_FQY (MsnMessage *msg) { + char *start = NULL; + LList *newbuds = NULL; + start = strstr(msg->payload, "<d n="); + + while(start) { + char *users = NULL, *user = NULL; + char *domain = start+6; + char *end = strchr(domain, '>'); + + *(end-1) = '\0'; + users = end+1; + end = strstr(end, "</d>"); + *end = '\0'; + + while((user = strstr(users, "<c "))) { + char buddy_buf[255]; + char *buddy_name; + char *attr = NULL, *attr_end = NULL; + int type = 0; + int list = 0; + char *uend = strstr(user, "/>"); + + MsnBuddy *bud = m_new0(MsnBuddy, 1); + + user += 3; + *uend = '\0'; + + attr = strstr(user, "n=\""); + attr += 3; + attr_end = strchr(attr, '\"'); + + *attr_end = '\0'; + buddy_name = strdup(attr); + *attr_end = '\"'; + + if((attr = strstr(user, "t=\""))) + type = atoi(attr+3); + snprintf(buddy_buf, sizeof(buddy_buf), "%s@%s", buddy_name, domain); + + bud->passport = strdup(buddy_buf); + bud->type = type; + bud->list = list; + + newbuds = l_list_append(newbuds, bud); + + free(buddy_name); + + users = uend+1; + } + + start = strstr(end+1, "<d n="); + } + + msg->payload_info = newbuds; } @@ -210,10 +264,10 @@ *attr_end = '\"'; if((attr = strstr(user, "t=\""))) - type = attr[3] - '0'; + type = atoi(attr+3); if((attr = strstr(user, "l=\""))) - list = attr[3] - '0'; + list = atoi(attr+3); snprintf(buddy_buf, sizeof(buddy_buf), "%s@%s", buddy_name, domain); @@ -626,7 +680,30 @@ static void msn_command_got_FQY (MsnConnection *mc) { + LList *l1, *l2; + LList *newbuds = mc->current_message->payload_info; + MsnAccount *ma = mc->account; + for(l1 = newbuds; l1; l1 = l_list_next(l1)) { + MsnBuddy *newbud = l1->data; + + /* See if this buddy exists */ + for(l2 = ma->buddies; l2; l2 = l_list_next(l2)) { + MsnBuddy *bud = l2->data; + if(!strcmp(newbud->passport, bud->passport)) { + newbud->list = bud->list; + break; + } + } + } + + msn_buddies_send_adl(mc->account, newbuds, 0, 0); + + for(l1 = newbuds; l1; l1 = l_list_next(l1)) + msn_buddy_free(l1->data); + + l_list_free(newbuds); + mc->current_message->payload_info = NULL; } Index: msn-contacts.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn-contacts.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- msn-contacts.c 6 Sep 2009 13:11:04 -0000 1.9 +++ msn-contacts.c 6 Sep 2009 18:23:08 -0000 1.10 @@ -78,84 +78,6 @@ } -void msn_got_initial_adl_response(MsnConnection *mc, void *data) -{ - ext_msn_contacts_synced(mc->account); -} - - -void msn_got_adl_response(MsnConnection *mc, void *data) -{ - /* Do nothing for now */ -} - - -/* Saved for FQY parsing -void msn_buddies_send_adl(MsnConnection *ma, LList *buddies) -{ - MsnMessage *msg = mc->current_message; - char out[MAX_ADL_SIZE], bufsize[5]; - int offset = 0; - char *domain = msg->payload; - - sprintf(out, "<ml l=\"1\">"); - offset = strlen(out); - - while(domain) { - char *contact, *contact_end, *end; - - domain = strstr(domain, "<d "); - - if(!domain) - break; - - end = strchr(domain, '>'); - end++; - - strncat(out, domain, end-domain); - offset += end-domain; - - contact = end; - contact_end = strstr(contact, "</d>"); - *contact_end = '\0'; - domain = contact_end+1; - - while(contact) { - char *t; - contact = strstr(contact, "c "); - - if(!contact) - break; - - contact +=5; - end = strchr(contact, '\"'); - *end = '\0'; - - t=strstr(end+1, "t=\""); - t += 3; - end = strchr(t, '\"'); - *end = '\0'; - - sprintf(out+offset, "<c n=\"%s\" l=\"3\" t=\"%s\"/>", contact, t); - offset += strlen(out+offset); - contact = end + 1; - } - - strcat(out, "</d>"); - offset += 4; - } - - strcat(out, "</ml>"); - - sprintf(bufsize, "%d", offset+5); - msn_message_send(mc, out, MSN_COMMAND_ADL, bufsize); - - msn_connection_push_callback(mc, msn_got_initial_adl_response, NULL); -} -*/ - - -/* This has become a convoluted piece of crap. Need to rework */ void msn_buddies_send_adl(MsnAccount *ma, LList *in, int initial, int add) { char buf[MAX_ADL_SIZE]; @@ -166,7 +88,7 @@ int offset = 0; char *cur_domain = NULL; int cur_type = 0; - int sent = 0; + int push_callback = 0; /* Sort the list */ while(in) { @@ -218,8 +140,7 @@ if( (count < MAX_ADL_CONTACTS - 1 && !strcmp(cur_domain, a->domain)) ) { if(!initial || cur_type == MSN_BUDDY_PASSPORT) snprintf(buf + offset, sizeof(buf) - offset, - "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, - (cur_type==MSN_BUDDY_PASSPORT)?1:4); + "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, cur_type); else snprintf(buf + offset, sizeof(buf) - offset, "<c n=\"%s\"/>", a->name); @@ -234,7 +155,6 @@ else msn_message_send(ma->ns_connection, buf, MSN_COMMAND_FQY, bufsize); - sent = 1; buf[0] = '\0'; offset = 0; count = 0; @@ -246,8 +166,7 @@ if(!initial || cur_type == MSN_BUDDY_PASSPORT) snprintf(buf + offset, sizeof(buf) - offset, - "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, - (cur_type==MSN_BUDDY_PASSPORT)?1:4); + "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, cur_type); else snprintf(buf + offset, sizeof(buf) - offset, "<c n=\"%s\"/>", a->name); @@ -257,8 +176,7 @@ if(!initial || cur_type == MSN_BUDDY_PASSPORT) snprintf(buf + offset, sizeof(buf) - offset, - "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, - (cur_type==MSN_BUDDY_PASSPORT)?1:4); + "<c n=\"%s\" l=\"%u\" t=\"%d\"/>", a->name, a->mask, cur_type); else snprintf(buf + offset, sizeof(buf) - offset, "<c n=\"%s\"/>", a->name); @@ -281,18 +199,10 @@ msn_message_send(ma->ns_connection, buf, MSN_COMMAND_ADL, bufsize); else msn_message_send(ma->ns_connection, buf, MSN_COMMAND_FQY, bufsize); - - sent = 1; } - if(initial) { - if(sent) - msn_connection_push_callback(ma->ns_connection, msn_got_initial_adl_response, NULL); - else - ext_msn_contacts_synced(ma); - } - else if(add) - msn_connection_push_callback(ma->ns_connection, msn_got_adl_response, in); + if(initial) + ext_msn_contacts_synced(ma); } Index: msn-contacts.h =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn-contacts.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- msn-contacts.h 30 Aug 2009 14:55:58 -0000 1.5 +++ msn-contacts.h 6 Sep 2009 18:23:08 -0000 1.6 @@ -23,6 +23,7 @@ #define _MSN_CONTACTS_H_ #include "msn.h" +#include "llist.h" void msn_download_address_book(MsnAccount *ma); void msn_sync_contacts(MsnAccount *ma); @@ -45,5 +46,7 @@ void msn_group_del(MsnAccount *ma, MsnGroup *group); void msn_group_add(MsnAccount *ma, const char *groupname); +void msn_buddies_send_adl(MsnAccount *ma, LList *buddies, int initial, int add); + #endif |