# HG changeset patch # User Daniel Atallah # Date 1189652554 0 # Node ID e73e510d56ec634818545e26d9563c854b6d8578 # Parent e4dc98b8e140a464bf534aa3e7302593964f4738 A fix from Laszlo Pandy to make the MSN HTTP Method work again. Fixes #2638 and should make a number of people happy. This introduces a new string that isn't marked as translatable for 2.2.0 because it is so late in the game. diff -r e4dc98b8e140 -r e73e510d56ec COPYRIGHT --- a/COPYRIGHT Thu Sep 13 02:38:20 2007 +0000 +++ b/COPYRIGHT Thu Sep 13 03:02:34 2007 +0000 @@ -270,6 +270,7 @@ Nathan Owens (pianocomp81) John Oyler Matt Pandina +Laszlo Pandy Ricardo Fernandez Pascual Riley Patterson Havoc Pennington diff -r e4dc98b8e140 -r e73e510d56ec libpurple/protocols/msn/httpconn.c --- a/libpurple/protocols/msn/httpconn.c Thu Sep 13 02:38:20 2007 +0000 +++ b/libpurple/protocols/msn/httpconn.c Thu Sep 13 03:02:34 2007 +0000 @@ -725,7 +725,7 @@ msn_httpconn_disconnect(httpconn); httpconn->connect_data = purple_proxy_connect(NULL, httpconn->session->account, - "gateway.messenger.hotmail.com", 80, connect_cb, httpconn); + host, 80, connect_cb, httpconn); if (httpconn->connect_data != NULL) { diff -r e4dc98b8e140 -r e73e510d56ec libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Thu Sep 13 02:38:20 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Thu Sep 13 03:02:34 2007 +0000 @@ -351,7 +351,7 @@ _("Do you want to allow or disallow people on " "your buddy list to send you MSN Mobile pages " "to your cell phone or other mobile device?"), - -1, + -1, purple_connection_get_account(gc), NULL, NULL, gc, 3, _("Allow"), G_CALLBACK(enable_msn_pages_cb), @@ -537,13 +537,13 @@ user = buddy->proto_data; - + if (purple_presence_is_online(presence)) { purple_notify_user_info_add_pair(user_info, _("Status"), (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status))); } - + if (full && user) { purple_notify_user_info_add_pair(user_info, _("Has you"), @@ -598,11 +598,11 @@ status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE, NULL, NULL, FALSE, TRUE, FALSE); types = g_list_append(types, status); - + status = purple_status_type_new_full(PURPLE_STATUS_MOBILE, "mobile", NULL, FALSE, FALSE, TRUE); types = g_list_append(types, status); - + return types; } @@ -730,7 +730,10 @@ http_method = purple_account_get_bool(account, "http_method", FALSE); - host = purple_account_get_string(account, "server", MSN_SERVER); + if (http_method) + host = purple_account_get_string(account, "http_method_server", MSN_SERVER); + else + host = purple_account_get_string(account, "server", MSN_SERVER); port = purple_account_get_int(account, "port", MSN_PORT); session = msn_session_new(account); @@ -1570,16 +1573,16 @@ /* No we're not. */ s = g_string_sized_new(strlen(url_buffer)); s2 = g_string_sized_new(strlen(url_buffer)); - + /* General section header */ if (has_tooltip_text) purple_notify_user_info_add_section_break(user_info); - + purple_notify_user_info_add_section_header(user_info, _("General")); - + /* Extract their Name and put it in */ MSN_GOT_INFO_GET_FIELD("Name", _("Name")); - + /* General */ MSN_GOT_INFO_GET_FIELD("Nickname", _("Nickname")); MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Age", _("Age")); @@ -1597,24 +1600,24 @@ sect_info = TRUE; MSN_GOT_INFO_GET_FIELD("More about me", _("A Little About Me")); - + if (sect_info) { has_info = TRUE; sect_info = FALSE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); if (has_tooltip_text) purple_notify_user_info_remove_last_item(user_info); } - + /* Social */ purple_notify_user_info_add_section_break(user_info); purple_notify_user_info_add_section_header(user_info, _("Social")); - + MSN_GOT_INFO_GET_FIELD("Marital status", _("Marital Status")); MSN_GOT_INFO_GET_FIELD("Interested in", _("Interests")); MSN_GOT_INFO_GET_FIELD("Pets", _("Pets")); @@ -1630,7 +1633,7 @@ has_info = TRUE; sect_info = FALSE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1662,7 +1665,7 @@ sect_info = FALSE; has_contact_info = TRUE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1692,7 +1695,7 @@ sect_info = FALSE; has_contact_info = TRUE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1867,7 +1870,7 @@ tmp = g_strdup_printf("%s%s", PROFILE_URL, info_data->name, PROFILE_URL, info_data->name); purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp); - g_free(tmp); + g_free(tmp); #if PHOTO_SUPPORT /* Find the URL to the photo; must be before the marshalling [Bug 994207] */ @@ -2193,6 +2196,12 @@ prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + /* TODO: Mark translatable as soon as 2.2.0 is released and we're not string frozen */ + option = purple_account_option_string_new("HTTP Method Server", + "http_method_server", MSN_HTTPCONN_SERVER); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + option = purple_account_option_bool_new(_("Show custom smileys"), "custom_smileys", TRUE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, diff -r e4dc98b8e140 -r e73e510d56ec libpurple/protocols/msn/msn.h --- a/libpurple/protocols/msn/msn.h Thu Sep 13 02:38:20 2007 +0000 +++ b/libpurple/protocols/msn/msn.h Thu Sep 13 03:02:34 2007 +0000 @@ -59,6 +59,7 @@ #define USEROPT_MSNSERVER 3 #define MSN_SERVER "messenger.hotmail.com" +#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com" #define USEROPT_MSNPORT 4 #define MSN_PORT 1863 diff -r e4dc98b8e140 -r e73e510d56ec libpurple/protocols/msn/servconn.c --- a/libpurple/protocols/msn/servconn.c Thu Sep 13 02:38:20 2007 +0000 +++ b/libpurple/protocols/msn/servconn.c Thu Sep 13 03:02:34 2007 +0000 @@ -223,7 +223,7 @@ if (!servconn->httpconn->connected) if (!msn_httpconn_connect(servconn->httpconn, host, port)) - return FALSE;; + return FALSE; servconn->connected = TRUE; servconn->httpconn->virgin = TRUE;