comparison src/protocols/jabber/jabber.c @ 3328:d183c2703508

[gaim-migrate @ 3346] Remainder of fix for Gaim crashing on non-ASCII buddy alias (Jabber "name" attribute) chars. (Thanks, A Ho-seok Lee) committer: Tailor Script <[e-mail]>

3327:220c9f1fc75e

	}

	/*
	 * Add or remove a buddy?  Change buddy's alias or group?
	 */
	if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
		if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
			debug_printf("adding buddy [4]: %s\n", buddyname);
			b = add_buddy(GJ_GC(gjc), groupname ? groupname : _("Buddies"), buddyname,
				name ? name : buddyname);

			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
	}
	g_free(buddyname);

}

static void jabber_handleroster(gjconn gjc, xmlnode querynode)

3328:d183c2703508

	}

	/*
	 * Add or remove a buddy?  Change buddy's alias or group?
	 */
	if(name)
		name = utf8_to_str(name);

	if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
		if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
			debug_printf("adding buddy [4]: %s\n", buddyname);
			b = add_buddy(GJ_GC(gjc), groupname ? groupname : _("Buddies"), buddyname,
				name ? name : buddyname);

			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
	}

	if(name)
		g_free(name);

	g_free(buddyname);

}

static void jabber_handleroster(gjconn gjc, xmlnode querynode)