comparison libpurple/protocols/jabber/message.c @ 20685:02df6998b466

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265) to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 16:34:43 +0000
parents 41e39193e247 bacfbe346b47
children
comparison
equal deleted inserted replaced
20258:509ca8ebe515 20685:02df6998b466
325 type = xmlnode_get_attrib(packet, "type"); 325 type = xmlnode_get_attrib(packet, "type");
326 326
327 if(type) { 327 if(type) {
328 if(!strcmp(type, "normal")) 328 if(!strcmp(type, "normal"))
329 jm->type = JABBER_MESSAGE_NORMAL; 329 jm->type = JABBER_MESSAGE_NORMAL;
330 else if(!strcmp(type, "chat")) 330 else if(!strcmp(type, "chat"))
331 jm->type = JABBER_MESSAGE_CHAT; 331 jm->type = JABBER_MESSAGE_CHAT;
332 else if(!strcmp(type, "groupchat")) 332 else if(!strcmp(type, "groupchat"))
333 jm->type = JABBER_MESSAGE_GROUPCHAT; 333 jm->type = JABBER_MESSAGE_GROUPCHAT;
334 else if(!strcmp(type, "headline")) 334 else if(!strcmp(type, "headline"))
335 jm->type = JABBER_MESSAGE_HEADLINE; 335 jm->type = JABBER_MESSAGE_HEADLINE;