Mercurial > pidgin
comparison libpurple/protocols/msn/msn.c @ 20520:bd60afa72fce
propagate from branch 'im.pidgin.pidgin' (head b0967247f79b18b245cdaaaf3f803d6834aea19a)
to branch 'im.pidgin.cpw.khc.msnp14' (head 208fd9d013da9f505b94f0cd9f05e9a04dd8edc8)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:10:12 +0000 |
parents | 8a4748cbf844 4fdf9c1212e2 |
children | 3cdf78c6c850 |
comparison
equal
deleted
inserted
replaced
20519:8a4748cbf844 | 20520:bd60afa72fce |
---|---|
2314 option = purple_account_option_bool_new(_("Use HTTP Method"), | 2314 option = purple_account_option_bool_new(_("Use HTTP Method"), |
2315 "http_method", FALSE); | 2315 "http_method", FALSE); |
2316 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 2316 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
2317 option); | 2317 option); |
2318 | 2318 |
2319 /* TODO: Mark translatable as soon as 2.2.0 is released and we're not string frozen */ | 2319 option = purple_account_option_string_new(_("HTTP Method Server"), |
2320 option = purple_account_option_string_new("HTTP Method Server", | |
2321 "http_method_server", MSN_HTTPCONN_SERVER); | 2320 "http_method_server", MSN_HTTPCONN_SERVER); |
2322 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, | 2321 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
2323 option); | 2322 option); |
2324 | 2323 |
2325 option = purple_account_option_bool_new(_("Show custom smileys"), | 2324 option = purple_account_option_bool_new(_("Show custom smileys"), |