comparison: src/protocols/yahoo/yahoo.c
src/protocols/yahoo/yahoo.c
- changeset 14030
- 23144f1dc950
- parent 13941
- 287714bf2f7c
- child 14108
- 8f4414c9827b
equal
deleted
inserted
replaced
| 14029:0e8ca0cb7054 | 14030:23144f1dc950 |
|---|---|
| 808 } | 808 } |
| 809 | 809 |
| 810 if (!msg || !g_utf8_validate(msg, -1, NULL)) | 810 if (!msg || !g_utf8_validate(msg, -1, NULL)) |
| 811 return; | 811 return; |
| 812 | 812 |
| 813 /* TODO: Does this really need to be escaped? It seems like it doesn't. */ | |
| 813 escmsg = g_markup_escape_text(msg, -1); | 814 escmsg = g_markup_escape_text(msg, -1); |
| 814 | 815 |
| 815 prim = g_strdup_printf(_("Yahoo! system message for %s:"), | 816 prim = g_strdup_printf(_("Yahoo! system message for %s:"), |
| 816 me?me:gaim_connection_get_display_name(gc)); | 817 me?me:gaim_connection_get_display_name(gc)); |
| 817 gaim_notify_info(NULL, NULL, prim, escmsg); | 818 gaim_notify_info(NULL, NULL, prim, escmsg); |
| 2130 yahoo_process_picture_checksum(gc, pkt); | 2131 yahoo_process_picture_checksum(gc, pkt); |
| 2131 break; | 2132 break; |
| 2132 case YAHOO_SERVICE_PICTURE_UPLOAD: | 2133 case YAHOO_SERVICE_PICTURE_UPLOAD: |
| 2133 yahoo_process_picture_upload(gc, pkt); | 2134 yahoo_process_picture_upload(gc, pkt); |
| 2134 break; | 2135 break; |
| 2136 case YAHOO_SERVICE_AVATAR_UPDATE: | |
| 2137 yahoo_process_avatar_update(gc, pkt); | |
| 2138 break; | |
| 2135 case YAHOO_SERVICE_AUDIBLE: | 2139 case YAHOO_SERVICE_AUDIBLE: |
| 2136 yahoo_process_audible(gc, pkt); | 2140 yahoo_process_audible(gc, pkt); |
| 2137 break; | 2141 break; |
| 2138 default: | 2142 default: |
| 2139 gaim_debug(GAIM_DEBUG_ERROR, "yahoo", | 2143 gaim_debug(GAIM_DEBUG_ERROR, "yahoo", |
| 2232 { | 2236 { |
| 2233 GaimConnection *gc = data; | 2237 GaimConnection *gc = data; |
| 2234 struct yahoo_data *yd; | 2238 struct yahoo_data *yd; |
| 2235 struct yahoo_packet *pkt; | 2239 struct yahoo_packet *pkt; |
| 2236 | 2240 |
| 2237 if (!g_list_find(gaim_connections_get_all(), gc)) { | 2241 if (!GAIM_CONNECTION_IS_VALID(gc)) { |
| 2238 close(source); | 2242 close(source); |
| 2239 return; | 2243 return; |
| 2240 } | 2244 } |
| 2241 | 2245 |
| 2242 if (source < 0) { | 2246 if (source < 0) { |
| 2259 { | 2263 { |
| 2260 GaimConnection *gc = data; | 2264 GaimConnection *gc = data; |
| 2261 struct yahoo_data *yd; | 2265 struct yahoo_data *yd; |
| 2262 struct yahoo_packet *pkt; | 2266 struct yahoo_packet *pkt; |
| 2263 | 2267 |
| 2264 if (!g_list_find(gaim_connections_get_all(), gc)) { | 2268 if (!GAIM_CONNECTION_IS_VALID(gc)) { |
| 2265 close(source); | 2269 close(source); |
| 2266 return; | 2270 return; |
| 2267 } | 2271 } |
| 2268 | 2272 |
| 2269 if (source < 0) { | 2273 if (source < 0) { |
