comparison: src/protocols/oscar/oscar.c
src/protocols/oscar/oscar.c
- changeset 6879
- cc7abcef355c
- parent 6873
- 70cc4cd04196
- child 6905
- dd40a6134713
equal
deleted
inserted
replaced
| 6878:1739326d2eb1 | 6879:cc7abcef355c |
|---|---|
| 3575 if (file) { | 3575 if (file) { |
| 3576 fread(buf, 1, st.st_size, file); | 3576 fread(buf, 1, st.st_size, file); |
| 3577 fclose(file); | 3577 fclose(file); |
| 3578 gaim_debug(GAIM_DEBUG_INFO, "oscar", | 3578 gaim_debug(GAIM_DEBUG_INFO, "oscar", |
| 3579 "Uploading icon to icon server\n"); | 3579 "Uploading icon to icon server\n"); |
| 3580 aim_icon_upload(od->sess, buf, st.st_size); | 3580 aim_bart_upload(od->sess, buf, st.st_size); |
| 3581 } else | 3581 } else |
| 3582 gaim_debug(GAIM_DEBUG_ERROR, "oscar", | 3582 gaim_debug(GAIM_DEBUG_ERROR, "oscar", |
| 3583 "Can't open buddy icon file!\n"); | 3583 "Can't open buddy icon file!\n"); |
| 3584 g_free(buf); | 3584 g_free(buf); |
| 3585 } else { | 3585 } else { |
| 3595 return FALSE; | 3595 return FALSE; |
| 3596 } | 3596 } |
| 3597 | 3597 |
| 3598 bi = g_hash_table_lookup(od->buddyinfo, (char *)od->requesticon->data); | 3598 bi = g_hash_table_lookup(od->buddyinfo, (char *)od->requesticon->data); |
| 3599 if (bi && (bi->iconcsumlen > 0)) { | 3599 if (bi && (bi->iconcsumlen > 0)) { |
| 3600 aim_icon_request(od->sess, od->requesticon->data, bi->iconcsum, bi->iconcsumlen); | 3600 aim_bart_request(od->sess, od->requesticon->data, bi->iconcsum, bi->iconcsumlen); |
| 3601 return FALSE; | 3601 return FALSE; |
| 3602 } else { | 3602 } else { |
| 3603 char *sn = od->requesticon->data; | 3603 char *sn = od->requesticon->data; |
| 3604 od->requesticon = g_slist_remove(od->requesticon, sn); | 3604 od->requesticon = g_slist_remove(od->requesticon, sn); |
| 3605 free(sn); | 3605 free(sn); |
| 4647 | 4647 |
| 4648 static void oscar_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last, | 4648 static void oscar_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last, |
| 4649 const char *maiden, const char *city, const char *state, const char *country, const char *email) { | 4649 const char *maiden, const char *city, const char *state, const char *country, const char *email) { |
| 4650 struct oscar_data *od = (struct oscar_data *)gc->proto_data; | 4650 struct oscar_data *od = (struct oscar_data *)gc->proto_data; |
| 4651 if (strlen(email)) | 4651 if (strlen(email)) |
| 4652 aim_usersearch_address(od->sess, od->conn, email); | 4652 aim_search_address(od->sess, od->conn, email); |
| 4653 } | 4653 } |
| 4654 | 4654 |
| 4655 static void oscar_add_buddy(GaimConnection *gc, const char *name, GaimGroup *g) { | 4655 static void oscar_add_buddy(GaimConnection *gc, const char *name, GaimGroup *g) { |
| 4656 struct oscar_data *od = (struct oscar_data *)gc->proto_data; | 4656 struct oscar_data *od = (struct oscar_data *)gc->proto_data; |
| 4657 #ifdef NOSSI | 4657 #ifdef NOSSI |
| 5567 if (file) { | 5567 if (file) { |
| 5568 fread(buf, 1, st.st_size, file); | 5568 fread(buf, 1, st.st_size, file); |
| 5569 fclose(file); | 5569 fclose(file); |
| 5570 gaim_debug(GAIM_DEBUG_INFO, "oscar", | 5570 gaim_debug(GAIM_DEBUG_INFO, "oscar", |
| 5571 "Uploading icon to icon server\n"); | 5571 "Uploading icon to icon server\n"); |
| 5572 aim_icon_upload(od->sess, buf, st.st_size); | 5572 aim_bart_upload(od->sess, buf, st.st_size); |
| 5573 } else | 5573 } else |
| 5574 gaim_debug(GAIM_DEBUG_ERROR, "oscar", | 5574 gaim_debug(GAIM_DEBUG_ERROR, "oscar", |
| 5575 "Can't open buddy icon file!\n"); | 5575 "Can't open buddy icon file!\n"); |
| 5576 g_free(buf); | 5576 g_free(buf); |
| 5577 } else { | 5577 } else { |
