Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 28648:1a4b6f47258c
merge of '5e1784d5a975dc0726e72521fbf6024dfa281d84'
and 'e28bbfa3c8184843c6f30c7fe26da08ade3873c2'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 27 Nov 2009 07:13:38 +0000 |
| parents | 9feec7d1d95c 7622d3f86752 |
| children | 9ae3e70a327b |
comparison
equal
deleted
inserted
replaced
| 28647:f1437342cc0e | 28648:1a4b6f47258c |
|---|---|
| 474 int len; | 474 int len; |
| 475 | 475 |
| 476 if (NULL == packet) | 476 if (NULL == packet) |
| 477 return; | 477 return; |
| 478 | 478 |
| 479 if (!PURPLE_CONNECTION_IS_VALID(pc)) | |
| 480 return; | |
| 481 | |
| 479 js = purple_connection_get_protocol_data(pc); | 482 js = purple_connection_get_protocol_data(pc); |
| 483 | |
| 484 if (NULL == js) | |
| 485 return; | |
| 486 | |
| 480 if (js->bosh) | 487 if (js->bosh) |
| 481 if (g_str_equal((*packet)->name, "message") || | 488 if (g_str_equal((*packet)->name, "message") || |
| 482 g_str_equal((*packet)->name, "iq") || | 489 g_str_equal((*packet)->name, "iq") || |
| 483 g_str_equal((*packet)->name, "presence")) | 490 g_str_equal((*packet)->name, "presence")) |
| 484 xmlnode_set_namespace(*packet, "jabber:client"); | 491 xmlnode_set_namespace(*packet, "jabber:client"); |