Mercurial > pidgin.yaz
comparison libpurple/protocols/bonjour/bonjour_ft.c @ 25362:65cfc59858cf
propagate from branch 'im.pidgin.pidgin' (head d5bb29138cbe033bbfd8ec689203d73818765327)
to branch 'im.pidgin.pidgin.next.minor' (head 35ee8e40db640867e5b9239030cdc326e7f0a005)
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Sat, 13 Dec 2008 05:45:27 +0000 |
| parents | da46097b4722 35d0ce5f319a |
| children | d078048fb03a |
comparison
equal
deleted
inserted
replaced
| 25361:d9da15c9e2a1 | 25362:65cfc59858cf |
|---|---|
| 409 const char *type, *id; | 409 const char *type, *id; |
| 410 BonjourData *bd; | 410 BonjourData *bd; |
| 411 PurpleXfer *xfer; | 411 PurpleXfer *xfer; |
| 412 const gchar *name = NULL; | 412 const gchar *name = NULL; |
| 413 | 413 |
| 414 if(pc == NULL || packet == NULL || pb == NULL) | 414 g_return_if_fail(pc != NULL); |
| 415 return; | 415 g_return_if_fail(packet != NULL); |
| 416 g_return_if_fail(pb != NULL); | |
| 417 | |
| 416 bd = (BonjourData*) pc->proto_data; | 418 bd = (BonjourData*) pc->proto_data; |
| 417 if(bd == NULL) | 419 if(bd == NULL) |
| 418 return; | 420 return; |
| 419 | 421 |
| 420 purple_debug_info("bonjour", "xep-si-parse.\n"); | 422 purple_debug_info("bonjour", "xep-si-parse.\n"); |
| 491 { | 493 { |
| 492 const char *type, *from; | 494 const char *type, *from; |
| 493 xmlnode *query; | 495 xmlnode *query; |
| 494 BonjourData *bd; | 496 BonjourData *bd; |
| 495 | 497 |
| 496 if(pc == NULL || packet == NULL || pb == NULL) | 498 g_return_if_fail(pc != NULL); |
| 497 return; | 499 g_return_if_fail(packet != NULL); |
| 500 g_return_if_fail(pb != NULL); | |
| 498 | 501 |
| 499 bd = (BonjourData*) pc->proto_data; | 502 bd = (BonjourData*) pc->proto_data; |
| 500 if(bd == NULL) | 503 if(bd == NULL) |
| 501 return; | 504 return; |
| 502 | 505 |