# HG changeset patch # User Richard Laager # Date 1189966066 0 # Node ID 8a4748cbf8446b7ee7353b4556c3612dab1ca57f # Parent 4b20ec37460f6f6dfb216c36b75c178f392fc1ff# Parent e73e510d56ec634818545e26d9563c854b6d8578 explicit merge of '5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef' and '26aa195b85d196378bd98ee299a60fac553d5bcd' diff -r 4b20ec37460f -r 8a4748cbf844 COPYRIGHT --- a/COPYRIGHT Sun Sep 16 18:07:27 2007 +0000 +++ b/COPYRIGHT Sun Sep 16 18:07:46 2007 +0000 @@ -270,6 +270,7 @@ Nathan Owens (pianocomp81) John Oyler Matt Pandina +Laszlo Pandy Ricardo Fernandez Pascual Riley Patterson Havoc Pennington diff -r 4b20ec37460f -r 8a4748cbf844 libpurple/protocols/msn/httpconn.c --- a/libpurple/protocols/msn/httpconn.c Sun Sep 16 18:07:27 2007 +0000 +++ b/libpurple/protocols/msn/httpconn.c Sun Sep 16 18:07:46 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 4b20ec37460f -r 8a4748cbf844 libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Sun Sep 16 18:07:27 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Sep 16 18:07:46 2007 +0000 @@ -354,7 +354,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), @@ -570,7 +570,7 @@ user = buddy->proto_data; - + if (purple_presence_is_online(presence)) { const char *psm, *currentmedia, *name; @@ -609,7 +609,7 @@ g_free(tmp); } } - + if (full && user) { purple_notify_user_info_add_pair(user_info, _("Has you"), @@ -815,7 +815,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); @@ -1688,16 +1691,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")); @@ -1715,24 +1718,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")); @@ -1748,7 +1751,7 @@ has_info = TRUE; sect_info = FALSE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1780,7 +1783,7 @@ sect_info = FALSE; has_contact_info = TRUE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1810,7 +1813,7 @@ sect_info = FALSE; has_contact_info = TRUE; } - else + else { /* Remove the section header */ purple_notify_user_info_remove_last_item(user_info); @@ -1985,7 +1988,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] */ @@ -2313,6 +2316,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 4b20ec37460f -r 8a4748cbf844 libpurple/protocols/msn/msn.h --- a/libpurple/protocols/msn/msn.h Sun Sep 16 18:07:27 2007 +0000 +++ b/libpurple/protocols/msn/msn.h Sun Sep 16 18:07:46 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 4b20ec37460f -r 8a4748cbf844 libpurple/protocols/msn/servconn.c --- a/libpurple/protocols/msn/servconn.c Sun Sep 16 18:07:27 2007 +0000 +++ b/libpurple/protocols/msn/servconn.c Sun Sep 16 18:07:46 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;