Mercurial > pidgin.yaz
comparison libpurple/upnp.c @ 15629:2f0f563b3579
merge of '7822ac971c736a7e6545da828b1b79db67ad732f'
and 'edc9bd8e3fe860539f170f241e440e214993fcaf'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 13 Feb 2007 07:03:51 +0000 |
| parents | 58ff9a0ffce0 |
| children | 32c366eeeb99 |
comparison
equal
deleted
inserted
replaced
| 15607:66dc2367b137 | 15629:2f0f563b3579 |
|---|---|
| 350 size_t length; | 350 size_t length; |
| 351 const char *path, *start = strstr(baseURL, "://"); | 351 const char *path, *start = strstr(baseURL, "://"); |
| 352 start = start ? start + 3 : baseURL; | 352 start = start ? start + 3 : baseURL; |
| 353 path = strchr(start, '/'); | 353 path = strchr(start, '/'); |
| 354 length = path ? path - baseURL : strlen(baseURL); | 354 length = path ? path - baseURL : strlen(baseURL); |
| 355 controlURL = g_strdup_printf("%.*s%s", length, baseURL, tmp); | 355 controlURL = g_strdup_printf("%.*s%s", (int)length, baseURL, tmp); |
| 356 } else { | 356 } else { |
| 357 controlURL = g_strdup_printf("%s%s", baseURL, tmp); | 357 controlURL = g_strdup_printf("%s%s", baseURL, tmp); |
| 358 } | 358 } |
| 359 g_free(tmp); | 359 g_free(tmp); |
| 360 }else{ | 360 }else{ |