comparison src/protocols/jabber/jabber.c @ 4705:e34fe984f999

[gaim-migrate @ 5016] believe it or not, we do work on things besides the buddy list ;-) committer: Tailor Script <[e-mail]>

4704:56c70997fe5c

	ask = xmlnode_get_attrib(x, "ask");

	if((buddyname = get_realwho(gjc, who, FALSE, &gjid)) == NULL)
		return;

	/* JFIXME: jabber_handleroster() had a "FIXME: transport" at this
	 * equivilent point.  So...
	 *
	 * We haven't done anything interesting to this point, so we'll
	 * violate Good Coding Structure here by simply bailing out.

	/*
	 * 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 = gaim_find_buddy(GJ_GC(gjc)->account, buddyname)) == NULL) {
			struct buddy *b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name ? name : NULL);
			struct group *g;
			if (groupname) {
				if (!(g = gaim_find_group(groupname)))
					g = gaim_group_new(groupname);
			} else

				/*
				 * seems rude, but it seems to be the only way...
				 */
				gaim_blist_remove_buddy(b);
				b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name ? name : NULL);
				gaim_blist_add_buddy(b, gaim_find_group(groupname), NULL);
				gaim_blist_save();
				if(present) {
					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle,
							uc, 0);
				}
			} else if(name != NULL && strcmp(b->alias, name)) {
				g_snprintf(b->alias, sizeof(b->alias), "%s", name);
				gaim_blist_rename_buddy(b, buddyname);
				gaim_blist_save();
			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {

		 * See if there's an explict (new?) alias for the buddy or we can pull
		 * one out of current Gaim buddylist data for him.
		 */
		if(alias && alias[0] != '\0') {
			my_alias = alias;
		} else if(buddy && buddy->alias[0]) {
			my_alias = buddy->alias;
		}

		/* If there's an alias for the buddy, it's not 0-length
		 * and it doesn't match his JID, add the "name" attribute.

4705:e34fe984f999

	ask = xmlnode_get_attrib(x, "ask");

	if((buddyname = get_realwho(gjc, who, FALSE, &gjid)) == NULL)
		return;


	/* JFIXME: jabber_handleroster() had a "FIXME: transport" at this
	 * equivilent point.  So...
	 *
	 * We haven't done anything interesting to this point, so we'll
	 * violate Good Coding Structure here by simply bailing out.

	/*
	 * 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 = gaim_find_buddy(GJ_GC(gjc)->account, buddyname)) == NULL) {
			struct buddy *b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name);
			struct group *g;
			if (groupname) {
				if (!(g = gaim_find_group(groupname)))
					g = gaim_group_new(groupname);
			} else

				/*
				 * seems rude, but it seems to be the only way...
				 */
				gaim_blist_remove_buddy(b);
				b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name);
				gaim_blist_add_buddy(b, gaim_find_group(groupname), NULL);
				gaim_blist_save();
				if(present) {
					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle,
							uc, 0);
				}
			} else if(name != NULL && strcmp(b->alias, name)) {
				g_free(b->alias);
				b->alias = g_strdup(name);
				gaim_blist_rename_buddy(b, buddyname);
				gaim_blist_save();
			}
		}
	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {

		 * See if there's an explict (new?) alias for the buddy or we can pull
		 * one out of current Gaim buddylist data for him.
		 */
		if(alias && alias[0] != '\0') {
			my_alias = alias;
		} else if(buddy && buddy->alias) {
			my_alias = buddy->alias;
		}

		/* If there's an alias for the buddy, it's not 0-length
		 * and it doesn't match his JID, add the "name" attribute.