# HG changeset patch # User Stu Tomlinson # Date 1141394743 0 # Node ID b6772b3209c4a7e126d5ff1c3a30522314d9c5ea # Parent 0a8b72b12cef86fd57cec447464b54b34b422e24 [gaim-migrate @ 15762] Working parsing for the new MSN profiles. Much of this is #if 0'd out as it adds new strings - someone should remind me to undo that when we've thawed. committer: Tailor Script diff -r 0a8b72b12cef -r b6772b3209c4 src/protocols/msn/msn.c --- a/src/protocols/msn/msn.c Fri Mar 03 08:45:59 2006 +0000 +++ b/src/protocols/msn/msn.c Fri Mar 03 14:05:43 2006 +0000 @@ -1395,23 +1395,20 @@ char *p; char *it = NULL; - p = strstr(url_text, " title=\"Click to see the full-size photo.\">"); + if ((p = strstr(url_text, " contactparams:photopreauthurl=")) != NULL) + { + p += strlen(" contactparams:photopreauthurl="); + } - if (p) + if (p && (strncmp(p, "\"http://", 8) == 0)) { - /* Search backwards for "http://". This is stupid, but it works. */ - for (; !it && p > url_text; p -= 1) + char *q; + p += 1; /* skip only the " */ + q = strchr(p, '"'); + + if (q) { - if (strncmp(p, "\"http://", 8) == 0) - { - char *q; - p += 1; /* skip only the " */ - q = strchr(p, '"'); - if (q) - { - it = g_strndup(p, q - p); - } - } + it = g_strndup(p, q - p); } } @@ -1422,6 +1419,7 @@ #endif +#if 0 static char *msn_info_date_reformat(const char *field, size_t len) { char *tmp = g_strndup(field, len); @@ -1430,6 +1428,13 @@ g_free(tmp); return g_strdup(gaim_date_format_short(localtime(&t))); } +#endif + +#define MSN_GOT_INFO_GET_FIELD(a, b) \ + found = gaim_markup_extract_info_field(stripped, stripped_len, s, \ + "\n" a "\t", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \ + if (found) \ + sect_info = TRUE; static void msn_got_info(void *data, const char *url_text, size_t len) @@ -1441,9 +1446,14 @@ char *user_url = NULL; gboolean found; gboolean has_info = FALSE; + gboolean sect_info = FALSE; const char* title = NULL; char *url_buffer; - GString *s; +#if 0 /* XXX: undo this when strings have thawed */ + char *personal = NULL; + char *business = NULL; +#endif + GString *s, *s2; int stripped_len; #if PHOTO_SUPPORT char *photo_url_text = NULL; @@ -1470,6 +1480,7 @@ /* If they have a homepage link, MSN masks it such that we need to * fetch the url out before gaim_markup_strip_html() nukes it */ + /* I don't think this works with the new spaces profiles - Stu 3/2/06 */ if ((p = strstr(url_text, "Take a look at my */ + g_string_truncate(s, strlen(s->str) - 4); +#if 0 /* XXX: undo this when strings have thawed */ + g_string_append_printf(s2, _("%sGeneral
%s"), (tooltip_text != NULL) ? "

" : "", s->str); +#else + g_string_append_printf(s2, "%s%s", has_info ? "

" : "", + personal ? personal : "", + business ? business : ""); + } + + g_free(personal); + g_free(business); +#endif + g_string_free(s, TRUE); + s = s2; + +#if 0 /* these probably don't show up any more */ /* * The fields, 'A Little About Me', 'Favorite Things', 'Hobbies * and Interests', 'Favorite Quote', and 'My Homepage' may or may @@ -1683,6 +1777,7 @@ if (found) has_info = TRUE; +#endif /* If we were able to fetch a homepage url earlier, stick it in there */ if (user_url != NULL) @@ -1705,7 +1800,10 @@ * Note that if we have a nonempty tooltip_text, we know the user * exists. */ + /* This doesn't work with the new spaces profiles - Stu 3/2/06 char *p = strstr(url_buffer, "Unknown Member "); + * This might not work for long either ... */ + char *p = strstr(url_buffer, "form id=\"SpacesSearch\" name=\"SpacesSearch\""); GaimBuddy *b = gaim_find_buddy (gaim_connection_get_account(info_data->gc), info_data->name); g_string_append_printf(s, "
%s
%s

", @@ -1720,9 +1818,13 @@ "any information in the user's profile. " "The user most likely does not exist."))); } - /* put a link to the actual profile URL */ +#if 0 /* XXX: undo when strings thawed */ + g_string_append_printf(s, _("

%s: "), _("Profile URL")); +#else + g_string_append(s, "

"); g_string_append_printf(s, _("%s: "), _("Profile URL")); +#endif g_string_append_printf(s, "
%s%s
", PROFILE_URL, info_data->name, PROFILE_URL, info_data->name);