comparison libpurple/protocols/novell/novell.c @ 31907:99ca503ea087

Rename purple_notify_user_info_add_pair to purple_notify_user_info_add_pair_html, to be more explicit so hopefully people don't pass this non-html in the future.

31906:e8d4755ef84b

	tag = _("User ID");
	value = nm_user_record_get_userid(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair(user_info, tag, value);
	}

#if 0
	tag = _("DN");
	value = nm_user_record_get_dn(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair(user_info, tag, value);
	}
#endif /* if 0 */

	tag = _("Full name");
	value = nm_user_record_get_full_name(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair(user_info, tag, value);
	}

	count = nm_user_record_get_property_count(user_record);
	for (i = 0; i < count; i++) {
		property = nm_user_record_get_property(user_record, i);

			tag = _map_property_tag(nm_property_get_tag(property));
			value = nm_property_get_value(property);
			if (tag && value) {
				/* TODO: Check whether it's correct to call add_pair_html,
				         or if we should be using add_pair_plaintext */
				purple_notify_user_info_add_pair(user_info, tag, value);
			}
			nm_release_property(property);
		}
	}

			purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status_str);

			if (text) {
				/* TODO: Check whether it's correct to call add_pair_html,
				         or if we should be using add_pair_plaintext */
				purple_notify_user_info_add_pair(user_info, _("Message"), text);
			}
		}
	}
}

31907:99ca503ea087

	tag = _("User ID");
	value = nm_user_record_get_userid(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair_html(user_info, tag, value);
	}

#if 0
	tag = _("DN");
	value = nm_user_record_get_dn(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair_html(user_info, tag, value);
	}
#endif /* if 0 */

	tag = _("Full name");
	value = nm_user_record_get_full_name(user_record);
	if (value) {
		/* TODO: Check whether it's correct to call add_pair_html,
		         or if we should be using add_pair_plaintext */
		purple_notify_user_info_add_pair_html(user_info, tag, value);
	}

	count = nm_user_record_get_property_count(user_record);
	for (i = 0; i < count; i++) {
		property = nm_user_record_get_property(user_record, i);

			tag = _map_property_tag(nm_property_get_tag(property));
			value = nm_property_get_value(property);
			if (tag && value) {
				/* TODO: Check whether it's correct to call add_pair_html,
				         or if we should be using add_pair_plaintext */
				purple_notify_user_info_add_pair_html(user_info, tag, value);
			}
			nm_release_property(property);
		}
	}

			purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status_str);

			if (text) {
				/* TODO: Check whether it's correct to call add_pair_html,
				         or if we should be using add_pair_plaintext */
				purple_notify_user_info_add_pair_html(user_info, _("Message"), text);
			}
		}
	}
}