comparison libpurple/protocols/jabber/buddy.c @ 26045:62b41bb71a60

merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff' and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'

26044:b04508e5cc6c

				xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value);
		}

		avatar_data = purple_imgstore_get_data(img);
		avatar_len = purple_imgstore_get_size(img);
		/* have to get rid of the old PHOTO if it exists */
		if((photo = xmlnode_get_child(vc_node, "PHOTO"))) {
			xmlnode_free(photo);
		}
		photo = xmlnode_new_child(vc_node, "PHOTO");
		type = xmlnode_new_child(photo, "TYPE");

		js->avatar_hash = jabber_calculate_data_sha1sum(avatar_data, avatar_len);

		xmlnode_insert_data(binval, enc, -1);
		g_free(enc);
	}

	if (vc_node != NULL) {
		iq = jabber_iq_new(js, JABBER_IQ_SET);
		xmlnode_insert_child(iq->node, vc_node);

				
				/* publish the metadata */
				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
				
				g_free(hash);
			} else { /* if(img) */
				/* remove the metadata */
				xmlnode *metadata, *item;
				xmlnode *publish = xmlnode_new("publish");
				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);
				
				item = xmlnode_new_child(publish, "item");
				
				metadata = xmlnode_new_child(item, "metadata");
				xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);
				
				xmlnode_new_child(metadata, "stop");
				
				/* publish the metadata */
				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
			}
		} else {
			purple_debug(PURPLE_DEBUG_ERROR, "jabber",
						 "jabber_set_buddy_icon received non-png data");
		}
	}

	/* even when the image is not png, we can still publish the vCard, since this
	   one doesn't require a specific image type */

	/* publish vCard for those poor older clients */
	jabber_set_info(gc, purple_account_get_user_info(gc->account));

	gpresence = purple_account_get_presence(gc->account);
	status = purple_presence_get_active_status(gpresence);
	jabber_presence_send(gc->account, status);
}

/*
 * This is the callback from the "ok clicked" for "set vCard"
 *
 * Formats GSList data into XML-encoded string and returns a pointer
 * to said string.
 *
 * g_free()'ing the returned string space is the responsibility of
 * the caller.
 */
static void
jabber_format_info(PurpleConnection *gc, PurpleRequestFields *fields)
{
	xmlnode *vc_node;

26045:62b41bb71a60

				xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value);
		}

		avatar_data = purple_imgstore_get_data(img);
		avatar_len = purple_imgstore_get_size(img);
		/* Get rid of an old PHOTO if one exists.
		 * TODO: This may want to be modified to remove all old PHOTO
		 * children, at the moment some people have managed to get
		 * multiple PHOTO entries in their vCard. */
		if((photo = xmlnode_get_child(vc_node, "PHOTO"))) {
			xmlnode_free(photo);
		}
		photo = xmlnode_new_child(vc_node, "PHOTO");
		type = xmlnode_new_child(photo, "TYPE");

		js->avatar_hash = jabber_calculate_data_sha1sum(avatar_data, avatar_len);

		xmlnode_insert_data(binval, enc, -1);
		g_free(enc);
	} else if (vc_node) {
		xmlnode *photo;
		/* TODO: Remove all PHOTO children? (see above note) */
		if ((photo = xmlnode_get_child(vc_node, "PHOTO"))) {
			xmlnode_free(photo);
		}
	}

	if (vc_node != NULL) {
		iq = jabber_iq_new(js, JABBER_IQ_SET);
		xmlnode_insert_child(iq->node, vc_node);

				
				/* publish the metadata */
				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
				
				g_free(hash);
			} else {
				purple_debug_error("jabber", "jabber_set_buddy_icon received non-png data");
			}
		} else {
			/* remove the metadata */
			xmlnode *metadata, *item;
			xmlnode *publish = xmlnode_new("publish");
			xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);

			item = xmlnode_new_child(publish, "item");

			metadata = xmlnode_new_child(item, "metadata");
			xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);

			xmlnode_new_child(metadata, "stop");

			/* publish the metadata */
			jabber_pep_publish((JabberStream*)gc->proto_data, publish);
		}
	}

	/* vCard avatars do not have an image type requirement so update our
	 * vCard avatar regardless of image type for those poor older clients
	 */
	jabber_set_info(gc, purple_account_get_user_info(gc->account));

	gpresence = purple_account_get_presence(gc->account);
	status = purple_presence_get_active_status(gpresence);
	jabber_presence_send(gc->account, status);
}

/*
 * This is the callback from the "ok clicked" for "set vCard"
 *
 * Sets the vCard with data from PurpleRequestFields.
 */
static void
jabber_format_info(PurpleConnection *gc, PurpleRequestFields *fields)
{
	xmlnode *vc_node;