Mercurial > pidgin.yaz
comparison src/protocols/msn/msn.c @ 9569:8ba8477ca7b6
[gaim-migrate @ 10412]
wing and datallah say this fixes #994207
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Tue, 20 Jul 2004 03:46:17 +0000 |
parents | f1137cf462d8 |
children | fab73de5e494 |
comparison
equal
deleted
inserted
replaced
9568:80b3c9e31df4 | 9569:8ba8477ca7b6 |
---|---|
1515 | 1515 |
1516 /* Finish it off, and show it to them */ | 1516 /* Finish it off, and show it to them */ |
1517 g_string_append(s, "</body></html>\n"); | 1517 g_string_append(s, "</body></html>\n"); |
1518 | 1518 |
1519 #if PHOTO_SUPPORT | 1519 #if PHOTO_SUPPORT |
1520 /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ | |
1521 photo_url_text = msn_get_photo_url(url_text); | |
1520 | 1522 |
1521 /* Marshall the existing state */ | 1523 /* Marshall the existing state */ |
1522 info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData)); | 1524 info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData)); |
1523 info2_data->info_data = info_data; | 1525 info2_data->info_data = info_data; |
1524 info2_data->stripped = stripped; | 1526 info2_data->stripped = stripped; |
1527 info2_data->photo_url_text = photo_url_text; | 1529 info2_data->photo_url_text = photo_url_text; |
1528 info2_data->tooltip_text = tooltip_text; | 1530 info2_data->tooltip_text = tooltip_text; |
1529 info2_data->title = title; | 1531 info2_data->title = title; |
1530 | 1532 |
1531 /* Try to put the photo in there too, if there's one */ | 1533 /* Try to put the photo in there too, if there's one */ |
1532 photo_url_text = msn_get_photo_url(url_text); | |
1533 if (photo_url_text) { | 1534 if (photo_url_text) { |
1534 gaim_url_fetch(photo_url_text, FALSE, NULL, FALSE, msn_got_photo, | 1535 gaim_url_fetch(photo_url_text, FALSE, NULL, FALSE, msn_got_photo, |
1535 info2_data); | 1536 info2_data); |
1536 } else { | 1537 } else { |
1537 /* Emulate a callback */ | 1538 /* Emulate a callback */ |