comparison src/protocols/oscar/oscar.c @ 10498:aba3000cc50a

[gaim-migrate @ 11790] Show available messages in oscar tooltips correctly again. And remove an extra "if (!gaim_status_is_active(status)) return" committer: Tailor Script <[e-mail]>

10497:e6b87f7e8988

static void oscar_string_append_info(GaimConnection *gc, GString *str, const char *newline, GaimBuddy *b, aim_userinfo_t *userinfo)
{
	OscarData *od;
	GaimAccount *account;
	GaimPresence *presence;
	GaimPresence *buddy_presence;
	GaimGroup *g = NULL;
	struct buddyinfo *bi = NULL;
	char *tmp;

	od = gc->proto_data;
	account = gaim_connection_get_account(gc);
	presence = gaim_account_get_presence(account);
	buddy_presence = gaim_buddy_get_presence(b);

	if ((str == NULL) || (newline == NULL) || ((b == NULL) && (userinfo == NULL)))
		return;

	if (userinfo == NULL)

	if (b == NULL)
		b = gaim_find_buddy(account, userinfo->sn);

	if (b != NULL)
		g = gaim_find_buddys_group(b);

	if (userinfo != NULL)
		bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(account, userinfo->sn));

	if (b != NULL) {
		if (gaim_presence_is_online(buddy_presence)) {
			if (aim_sn_is_icq(b->name)) {
				tmp = oscar_icqstatus((b->uc & 0xffff0000) >> 16);
				oscar_string_append(str, newline, _("Status"), tmp);
				g_free(tmp);
			}

			oscar_string_append(str, newline, _("Buddy Comment"), tmp2);
			g_free(tmp2);
		}
	}

	if ((bi != NULL) && (bi->availmsg != NULL) && gaim_presence_is_available(presence)) {
		tmp = g_markup_escape_text(bi->availmsg, strlen(bi->availmsg));
		oscar_string_append(str, newline, _("Available"), tmp);
		g_free(tmp);
	}
}

	status_type = gaim_status_get_type(status);
	primitive = gaim_status_type_get_primitive(status_type);
	status_id = gaim_status_get_id(status);
	presence = gaim_account_get_presence(account);

	if (!gaim_status_is_active(status)) /* Is this right?  I'm confused. */
		return;

	gaim_debug_info("oscar", "Setting status to %s\n", status_id);

	if (gc)
		od = (OscarData *)gc->proto_data;

{
	GaimConnection *gc = gaim_account_get_connection(account);
	GaimStatusType *type = gaim_status_get_type(status);
	int primitive = gaim_status_type_get_primitive(type);

	if(!gaim_status_is_active(status))
		return;

	if (primitive == !GAIM_STATUS_OFFLINE && !gc) {
		gaim_account_connect(account, status);
	} else if (primitive == GAIM_STATUS_OFFLINE && gc) {

10498:aba3000cc50a

static void oscar_string_append_info(GaimConnection *gc, GString *str, const char *newline, GaimBuddy *b, aim_userinfo_t *userinfo)
{
	OscarData *od;
	GaimAccount *account;
	GaimPresence *presence;
	GaimStatus *status;
	GaimGroup *g = NULL;
	struct buddyinfo *bi = NULL;
	char *tmp;

	od = gc->proto_data;
	account = gaim_connection_get_account(gc);

	if ((str == NULL) || (newline == NULL) || ((b == NULL) && (userinfo == NULL)))
		return;

	if (userinfo == NULL)

	if (b == NULL)
		b = gaim_find_buddy(account, userinfo->sn);

	if (b != NULL)
	{
		g = gaim_find_buddys_group(b);
		presence = gaim_buddy_get_presence(b);
		status = gaim_presence_get_active_status(presence);
	}

	if (userinfo != NULL)
		bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(account, userinfo->sn));

	if (b != NULL) {
		if (gaim_presence_is_online(presence)) {
			if (aim_sn_is_icq(b->name)) {
				tmp = oscar_icqstatus((b->uc & 0xffff0000) >> 16);
				oscar_string_append(str, newline, _("Status"), tmp);
				g_free(tmp);
			}

			oscar_string_append(str, newline, _("Buddy Comment"), tmp2);
			g_free(tmp2);
		}
	}

	if ((bi != NULL) && (bi->availmsg != NULL) && gaim_status_is_available(status)) {
		tmp = g_markup_escape_text(bi->availmsg, strlen(bi->availmsg));
		oscar_string_append(str, newline, _("Available"), tmp);
		g_free(tmp);
	}
}

	status_type = gaim_status_get_type(status);
	primitive = gaim_status_type_get_primitive(status_type);
	status_id = gaim_status_get_id(status);
	presence = gaim_account_get_presence(account);

	gaim_debug_info("oscar", "Setting status to %s\n", status_id);

	if (gc)
		od = (OscarData *)gc->proto_data;

{
	GaimConnection *gc = gaim_account_get_connection(account);
	GaimStatusType *type = gaim_status_get_type(status);
	int primitive = gaim_status_type_get_primitive(type);

	if (!gaim_status_is_active(status))
		return;

	if (primitive == !GAIM_STATUS_OFFLINE && !gc) {
		gaim_account_connect(account, status);
	} else if (primitive == GAIM_STATUS_OFFLINE && gc) {