comparison src/protocols/jabber/jabber.c @ 3059:966c4e460ebb

[gaim-migrate @ 3073] Better support for Jabber resources by Jim Seymour committer: Tailor Script <[e-mail]>

3058:c7ded94da25f

	if((g = xmlnode_get_tag(x, "group")) == NULL || (groupname = xmlnode_get_data(g)) == NULL) {
		groupname = _("Buddies");
	}


	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, buddyname,
				name ? name : buddyname);
			do_export(GJ_GC(gjc));
		}
	/*
	 * TBD: this is what we *would* do if we could.  But the
	 * remove_buddy() code doesn't update the UI.  And if the
	 * user selects and tries to remove a buddy already removed
	 * via here: *ka-boom*!
	 *
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		if ((b = find_buddy(GJ_GC(gjc), buddyname)) != NULL) {
			struct group *group;

			group = find_group_by_buddy(GJ_GC(gjc), buddyname);
			debug_printf("removing buddy [1]: %s, from group: %s\n",
				buddyname, group->name);
			remove_buddy(GJ_GC(gjc), group, b);
			do_export(GJ_GC(gjc));
		}
	 */
	}
	g_free(buddyname);

}

3059:966c4e460ebb

	if((g = xmlnode_get_tag(x, "group")) == NULL || (groupname = xmlnode_get_data(g)) == NULL) {
		groupname = _("Buddies");
	}


	/*
	 * Add or remove a buddy?
	 */
	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, buddyname,
				name ? name : buddyname);
			do_export(GJ_GC(gjc));
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
		if ((b = find_buddy(GJ_GC(gjc), buddyname)) != NULL) {
			struct group *group;

			group = find_group_by_buddy(GJ_GC(gjc), buddyname);
			debug_printf("removing buddy [1]: %s, from group: %s\n",
				buddyname, group->name);
			remove_buddy(GJ_GC(gjc), group, b);
			do_export(GJ_GC(gjc));
		}
	}
	g_free(buddyname);

}