comparison src/protocols/oscar/oscar.c @ 6879:594682101ba6

[gaim-migrate @ 7425] I renamed newsearch.c to odir.c and icon.c to bart.c I get the feeling this is what AOL calls them. I also changed the aim_icon_bleh functions to aim_bart_bleh aim_usersearch_bleh to aim_search_bleh or aim_odir_bleh committer: Tailor Script <[e-mail]>

6878:618124fe3289

			if (file) {
				fread(buf, 1, st.st_size, file);
				fclose(file);
				gaim_debug(GAIM_DEBUG_INFO, "oscar",
					   "Uploading icon to icon server\n");
				aim_icon_upload(od->sess, buf, st.st_size);
			} else
				gaim_debug(GAIM_DEBUG_ERROR, "oscar",
					   "Can't open buddy icon file!\n");
			g_free(buf);
		} else {

		return FALSE;
	}

	bi = g_hash_table_lookup(od->buddyinfo, (char *)od->requesticon->data);
	if (bi && (bi->iconcsumlen > 0)) {
		aim_icon_request(od->sess, od->requesticon->data, bi->iconcsum, bi->iconcsumlen);
		return FALSE;
	} else {
		char *sn = od->requesticon->data;
		od->requesticon = g_slist_remove(od->requesticon, sn);
		free(sn);

static void oscar_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last,
			     const char *maiden, const char *city, const char *state, const char *country, const char *email) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
	if (strlen(email))
		aim_usersearch_address(od->sess, od->conn, email);
}

static void oscar_add_buddy(GaimConnection *gc, const char *name, GaimGroup *g) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
#ifdef NOSSI

						if (file) {
							fread(buf, 1, st.st_size, file);
							fclose(file);
							gaim_debug(GAIM_DEBUG_INFO, "oscar",
								   "Uploading icon to icon server\n");
							aim_icon_upload(od->sess, buf, st.st_size);
						} else
							gaim_debug(GAIM_DEBUG_ERROR, "oscar",
								   "Can't open buddy icon file!\n");
						g_free(buf);
					} else {

6879:594682101ba6

			if (file) {
				fread(buf, 1, st.st_size, file);
				fclose(file);
				gaim_debug(GAIM_DEBUG_INFO, "oscar",
					   "Uploading icon to icon server\n");
				aim_bart_upload(od->sess, buf, st.st_size);
			} else
				gaim_debug(GAIM_DEBUG_ERROR, "oscar",
					   "Can't open buddy icon file!\n");
			g_free(buf);
		} else {

		return FALSE;
	}

	bi = g_hash_table_lookup(od->buddyinfo, (char *)od->requesticon->data);
	if (bi && (bi->iconcsumlen > 0)) {
		aim_bart_request(od->sess, od->requesticon->data, bi->iconcsum, bi->iconcsumlen);
		return FALSE;
	} else {
		char *sn = od->requesticon->data;
		od->requesticon = g_slist_remove(od->requesticon, sn);
		free(sn);

static void oscar_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last,
			     const char *maiden, const char *city, const char *state, const char *country, const char *email) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
	if (strlen(email))
		aim_search_address(od->sess, od->conn, email);
}

static void oscar_add_buddy(GaimConnection *gc, const char *name, GaimGroup *g) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
#ifdef NOSSI

						if (file) {
							fread(buf, 1, st.st_size, file);
							fclose(file);
							gaim_debug(GAIM_DEBUG_INFO, "oscar",
								   "Uploading icon to icon server\n");
							aim_bart_upload(od->sess, buf, st.st_size);
						} else
							gaim_debug(GAIM_DEBUG_ERROR, "oscar",
								   "Can't open buddy icon file!\n");
						g_free(buf);
					} else {