pidgin: libpurple/protocols/msn/msn.c comparison

comparison libpurple/protocols/msn/msn.c @ 20519:8a4748cbf844

explicit merge of '5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef' and '26aa195b85d196378bd98ee299a60fac553d5bcd'

author	Richard Laager <rlaager@wiktel.com>
date	Sun, 16 Sep 2007 18:07:46 +0000
parents	5bc492d82ff4 e73e510d56ec
children	bd60afa72fce

comparison

equal deleted inserted replaced

-:4b20ec37460f
+:8a4748cbf844
 	purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"),
 						_("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,
 						purple_connection_get_account(gc), NULL, NULL,
 						gc, 3,
 						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
 						_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
 						_("Cancel"), NULL);
 	PurplePresence *presence = purple_buddy_get_presence(buddy);
 	PurpleStatus *status = purple_presence_get_active_status(presence);
 	user = buddy->proto_data;
 	if (purple_presence_is_online(presence))
 	{
 		const char *psm, *currentmedia, *name;
 		char *tmp;
 			tmp = g_markup_escape_text(currentmedia, -1);
 			purple_notify_user_info_add_pair(user_info, _("Current media"), tmp);
 			g_free(tmp);
 		}
 	}
 	if (full && user)
 	{
 		purple_notify_user_info_add_pair(user_info, _("Has you"),
 									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
 	}
 		return;
 	}
 	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);
 	gc->proto_data = session;
 	/* Gonna re-use the memory we've already got for url_buffer */
 	/* 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"));
 	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Gender", _("Gender"));
 	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Occupation", _("Occupation"));
 	if (found)
 		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
 {
 		/* 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"));
 	MSN_GOT_INFO_GET_FIELD("Hometown", _("Hometown"));
 	MSN_GOT_INFO_GET_FIELD("Places lived", _("Places Lived"));
 	if (sect_info)
 	{
 		has_info = TRUE;
 		sect_info = FALSE;
 	}
 else
 {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
 		purple_notify_user_info_remove_last_item(user_info);
 	}
 	{
 		has_info = TRUE;
 		sect_info = FALSE;
 		has_contact_info = TRUE;
 	}
 else
 {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
 	}
 	{
 		has_info = TRUE;
 		sect_info = FALSE;
 		has_contact_info = TRUE;
 	}
 else
 {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
 	}
 	/* put a link to the actual profile URL */
 	tmp = g_strdup_printf("<a href=\"%s%s\">%s%s</a>",
 					PROFILE_URL, info_data->name, PROFILE_URL, info_data->name);
 	purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp);
 	g_free(tmp);
 #if PHOTO_SUPPORT
 	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
 	photo_url_text = msn_get_photo_url(url_text);
 	purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text);
 	option = purple_account_option_bool_new(_("Use HTTP Method"),
 										  "http_method", FALSE);
 	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,
 											   option);

Mercurial > pidgin

comparison libpurple/protocols/msn/msn.c @ 20519:8a4748cbf844