comparison libpurple/protocols/msn/msn.c @ 20353:a482263cf1d8

applied changes from 78373ac0523b4bcf8530364077593f822030f45d through ce7bc52a1e7b3d401f32806e3c3fe19c759152fc
author Luke Schierer <lschiere@pidgin.im>
date Sun, 21 Oct 2007 04:53:02 +0000
parents c37128d87d5a
children 89c7be36fd61
comparison
equal deleted inserted replaced
20352:45cf81350a75 20353:a482263cf1d8
1482 gboolean has_tooltip_text = FALSE; 1482 gboolean has_tooltip_text = FALSE;
1483 gboolean has_info = FALSE; 1483 gboolean has_info = FALSE;
1484 gboolean sect_info = FALSE; 1484 gboolean sect_info = FALSE;
1485 gboolean has_contact_info = FALSE; 1485 gboolean has_contact_info = FALSE;
1486 char *url_buffer; 1486 char *url_buffer;
1487 GString *s, *s2;
1488 int stripped_len; 1487 int stripped_len;
1489 #if PHOTO_SUPPORT 1488 #if PHOTO_SUPPORT
1490 char *photo_url_text = NULL; 1489 char *photo_url_text = NULL;
1491 MsnGetInfoStepTwoData *info2_data = NULL; 1490 MsnGetInfoStepTwoData *info2_data = NULL;
1492 #endif 1491 #endif
1566 stripped = purple_markup_strip_html(url_buffer); 1565 stripped = purple_markup_strip_html(url_buffer);
1567 stripped_len = strlen(stripped); 1566 stripped_len = strlen(stripped);
1568 1567
1569 purple_debug_misc("msn", "stripped = %p\n", stripped); 1568 purple_debug_misc("msn", "stripped = %p\n", stripped);
1570 purple_debug_misc("msn", "url_buffer = %p\n", url_buffer); 1569 purple_debug_misc("msn", "url_buffer = %p\n", url_buffer);
1571
1572 /* Gonna re-use the memory we've already got for url_buffer */
1573 /* No we're not. */
1574 s = g_string_sized_new(strlen(url_buffer));
1575 s2 = g_string_sized_new(strlen(url_buffer));
1576 1570
1577 /* General section header */ 1571 /* General section header */
1578 if (has_tooltip_text) 1572 if (has_tooltip_text)
1579 purple_notify_user_info_add_section_break(user_info); 1573 purple_notify_user_info_add_section_break(user_info);
1580 1574
1917 g_list_find(purple_connections_get_all(), info_data->gc) == NULL)) 1911 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
1918 { 1912 {
1919 purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); 1913 purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
1920 g_free(stripped); 1914 g_free(stripped);
1921 g_free(url_buffer); 1915 g_free(url_buffer);
1922 g_free(user_info); 1916 purple_notify_user_info_destroy(user_info);
1923 g_free(info_data->name); 1917 g_free(info_data->name);
1924 g_free(info_data); 1918 g_free(info_data);
1925 g_free(photo_url_text); 1919 g_free(photo_url_text);
1926 g_free(info2_data); 1920 g_free(info2_data);
1927 1921