Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Fri Sep 28 16:32:28 2007 +0000 +++ b/libpurple/protocols/jabber/message.c Fri Sep 28 16:34:43 2007 +0000 @@ -327,7 +327,7 @@ if(type) { if(!strcmp(type, "normal")) jm->type = JABBER_MESSAGE_NORMAL; - else if(!strcmp(type, "chat")) + else if(!strcmp(type, "chat")) jm->type = JABBER_MESSAGE_CHAT; else if(!strcmp(type, "groupchat")) jm->type = JABBER_MESSAGE_GROUPCHAT;