comparison src/protocols/oscar/oscar.c @ 4292:78a3d2caf84c

[gaim-migrate @ 4545] Better alias synchronization, as well as a rare crash fix (when changing the alias of buddies that you are awaiting authorization from). I'll get rid of those annoying auth dialogs at signon tomorrow. I hope. committer: Tailor Script <[e-mail]>

4291:7d3c552c4a89

	tmp = 0;
	for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
		switch (curitem->type) {
			case 0x0000: { /* Buddy */
				if (curitem->name) {
					char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, curitem->name);
					char *alias = aim_ssi_getalias(sess->ssi.local, gname, curitem->name);
					struct buddy *buddy = find_buddy(gc, curitem->name);
					if (buddy) {
						if (alias)
							strcpy(buddy->alias, alias);
					} else {
						debug_printf("ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
						add_buddy(gc, (gname ? gname : "orphans"), curitem->name, alias);

		/* Buddies */
		cur = gc->groups;
		while (cur) {
			GSList *curbud;
			for (curbud=((struct group*)cur->data)->members; curbud; curbud=curbud->next)
				if (!aim_ssi_itemlist_exists(sess->ssi.local, ((struct buddy*)curbud->data)->name)) {
					debug_printf("ssi: adding buddy %s from local list to server list\n", ((struct buddy*)curbud->data)->name);
					aim_ssi_addbuddy(od->sess, od->conn, ((struct buddy*)curbud->data)->name, ((struct group*)cur->data)->name, get_buddy_alias_only((struct buddy *)curbud->data), NULL, NULL, 0);
				}
			cur = g_slist_next(cur);
		}

		/* Permit list */
		if (gc->permit) {
			for (cur=gc->permit; cur; cur=cur->next)
				if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_PERMIT)) {
					debug_printf("ssi: adding permit %s from local list to server list\n", (char *)cur->data);
					aim_ssi_addpermit(od->sess, od->conn, cur->data);
				}
		}

		/* Deny list */
		if (gc->deny) {
			for (cur=gc->deny; cur; cur=cur->next)
				if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_DENY)) {
					debug_printf("ssi: adding deny %s from local list to server list\n", (char *)cur->data);
					aim_ssi_adddeny(od->sess, od->conn, cur->data);
				}
		}

		/* Presence settings (idle time visibility) */
		if ((tmp = aim_ssi_getpresence(sess->ssi.local)) != 0xFFFFFFFF)

4292:78a3d2caf84c

	tmp = 0;
	for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
		switch (curitem->type) {
			case 0x0000: { /* Buddy */
				if (curitem->name) {
					char *gname = aim_ssi_itemlist_findparentname(sess->ssi.local, curitem->name);
					char *alias = aim_ssi_getalias(sess->ssi.local, gname, curitem->name);
					struct buddy *buddy = find_buddy(gc, curitem->name);
					if (buddy) {
						/* Get server stored alias */
						if (alias)
							strcpy(buddy->alias, alias);
					} else {
						debug_printf("ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
						add_buddy(gc, (gname ? gname : "orphans"), curitem->name, alias);

		/* Buddies */
		cur = gc->groups;
		while (cur) {
			GSList *curbud;
			for (curbud=((struct group*)cur->data)->members; curbud; curbud=curbud->next) {
				struct buddy *buddy = curbud->data;
				char *gname = aim_ssi_itemlist_findparentname(sess->ssi.local, buddy->name);
				char *alias = aim_ssi_getalias(sess->ssi.local, gname, buddy->name);
				if (aim_ssi_itemlist_exists(sess->ssi.local, buddy->name)) {
					/* Store local alias on server */
					if (!alias && buddy->alias[0])
						aim_ssi_aliasbuddy(sess, od->conn, gname, buddy->name, buddy->alias);
				} else {
					debug_printf("ssi: adding buddy %s from local list to server list\n", ((struct buddy*)curbud->data)->name);
					aim_ssi_addbuddy(sess, od->conn, buddy->name, ((struct group*)cur->data)->name, get_buddy_alias_only((struct buddy *)curbud->data), NULL, NULL, 0);
				}
				free(alias);
			}
			cur = g_slist_next(cur);
		}

		/* Permit list */
		if (gc->permit) {
			for (cur=gc->permit; cur; cur=cur->next)
				if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_PERMIT)) {
					debug_printf("ssi: adding permit %s from local list to server list\n", (char *)cur->data);
					aim_ssi_addpermit(sess, od->conn, cur->data);
				}
		}

		/* Deny list */
		if (gc->deny) {
			for (cur=gc->deny; cur; cur=cur->next)
				if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_DENY)) {
					debug_printf("ssi: adding deny %s from local list to server list\n", (char *)cur->data);
					aim_ssi_adddeny(sess, od->conn, cur->data);
				}
		}

		/* Presence settings (idle time visibility) */
		if ((tmp = aim_ssi_getpresence(sess->ssi.local)) != 0xFFFFFFFF)