comparison libpurple/protocols/jabber/buddy.c @ 31920:0cc718e10344

Actually commit the purple_notify_user_info_prepend_pair_plaintext function. I think I left it off my previous commit? Sorry. And rename purple_notify_user_info_prepend_pair to purple_notify_user_info_prepend_pair_html_html

31919:090736a289da

			g_strdup_printf("%s%s%s", jbr->client.name,
		                    (jbr->client.version ? " " : ""),
		                    (jbr->client.version ? jbr->client.version : ""));
		/* TODO: Check whether it's correct to call prepend_pair_html,
		         or if we should be using prepend_pair_plaintext */
		purple_notify_user_info_prepend_pair(user_info, _("Client"), tmp);
		g_free(tmp);

		if (jbr->client.os) {
			/* TODO: Check whether it's correct to call prepend_pair_html,
			         or if we should be using prepend_pair_plaintext */
			purple_notify_user_info_prepend_pair(user_info, _("Operating System"), jbr->client.os);
		}
	}

	if (jbr && jbr->tz_off != PURPLE_NO_TZ_OFF) {
		time_t now_t;

		}

		tmp = g_strdup_printf("%s%s%s", (status_name ? status_name : ""),
						((status_name && purdy) ? ": " : ""),
						(purdy ? purdy : ""));
		purple_notify_user_info_prepend_pair(user_info, _("Status"), tmp);

		g_snprintf(priority, sizeof(priority), "%d", jbr->priority);
		purple_notify_user_info_prepend_pair_plaintext(user_info, _("Priority"), priority);

		g_free(tmp);

			add_jbr_info(jbi, jbr->name, jbr);

			if (jbr->name) {
				/* TODO: Check whether it's correct to call prepend_pair_html,
				         or if we should be using prepend_pair_plaintext */
				purple_notify_user_info_prepend_pair(user_info, _("Resource"), jbr->name);
			}
		}
	}

	if (!jbi->jb->resources) {

				g_strdup_printf("%s%s%s",	_("Offline"),
				                jbi->last_message ? ": " : "",
				                jbi->last_message ? jbi->last_message : "");
			/* TODO: Check whether it's correct to call prepend_pair_html,
			         or if we should be using prepend_pair_plaintext */
			purple_notify_user_info_prepend_pair(user_info, _("Status"), status);
			g_free(status);
		}
	}

	g_free(resource_name);

31920:0cc718e10344

			g_strdup_printf("%s%s%s", jbr->client.name,
		                    (jbr->client.version ? " " : ""),
		                    (jbr->client.version ? jbr->client.version : ""));
		/* TODO: Check whether it's correct to call prepend_pair_html,
		         or if we should be using prepend_pair_plaintext */
		purple_notify_user_info_prepend_pair_html(user_info, _("Client"), tmp);
		g_free(tmp);

		if (jbr->client.os) {
			/* TODO: Check whether it's correct to call prepend_pair_html,
			         or if we should be using prepend_pair_plaintext */
			purple_notify_user_info_prepend_pair_html(user_info, _("Operating System"), jbr->client.os);
		}
	}

	if (jbr && jbr->tz_off != PURPLE_NO_TZ_OFF) {
		time_t now_t;

		}

		tmp = g_strdup_printf("%s%s%s", (status_name ? status_name : ""),
						((status_name && purdy) ? ": " : ""),
						(purdy ? purdy : ""));
		purple_notify_user_info_prepend_pair_html(user_info, _("Status"), tmp);

		g_snprintf(priority, sizeof(priority), "%d", jbr->priority);
		purple_notify_user_info_prepend_pair_plaintext(user_info, _("Priority"), priority);

		g_free(tmp);

			add_jbr_info(jbi, jbr->name, jbr);

			if (jbr->name) {
				/* TODO: Check whether it's correct to call prepend_pair_html,
				         or if we should be using prepend_pair_plaintext */
				purple_notify_user_info_prepend_pair_html(user_info, _("Resource"), jbr->name);
			}
		}
	}

	if (!jbi->jb->resources) {

				g_strdup_printf("%s%s%s",	_("Offline"),
				                jbi->last_message ? ": " : "",
				                jbi->last_message ? jbi->last_message : "");
			/* TODO: Check whether it's correct to call prepend_pair_html,
			         or if we should be using prepend_pair_plaintext */
			purple_notify_user_info_prepend_pair_html(user_info, _("Status"), status);
			g_free(status);
		}
	}

	g_free(resource_name);