Mercurial > pidgin.yaz
comparison libpurple/stun.c @ 26003:983311560ef9
merge of 'b7c7f0f5daca252711952e60e283dd18a1983d33'
and 'e878814dfc99f1f0a681a2263488c75a068c7c8e'
| author | Peter Hjalmarsson <xake@rymdraket.net> |
|---|---|
| date | Wed, 04 Mar 2009 16:52:47 +0000 |
| parents | a6e3cb32cdd2 |
| children | 5d1140b0b10a |
comparison
equal
deleted
inserted
replaced
| 25922:d03177395ae0 | 26003:983311560ef9 |
|---|---|
| 386 gboolean use_cached_result = TRUE; | 386 gboolean use_cached_result = TRUE; |
| 387 | 387 |
| 388 /** Deal with the server name having changed since we did the | 388 /** Deal with the server name having changed since we did the |
| 389 lookup */ | 389 lookup */ |
| 390 if (servername && strlen(servername) > 1 | 390 if (servername && strlen(servername) > 1 |
| 391 && ((nattype.servername | 391 && !purple_strequal(servername, nattype.servername)) { |
| 392 && strcmp(servername, nattype.servername)) | |
| 393 || !nattype.servername)) { | |
| 394 use_cached_result = FALSE; | 392 use_cached_result = FALSE; |
| 395 } | 393 } |
| 396 | 394 |
| 397 /* If we don't have a successful status and it has been 5 | 395 /* If we don't have a successful status and it has been 5 |
| 398 minutes since we last did a lookup, redo the lookup */ | 396 minutes since we last did a lookup, redo the lookup */ |