comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- changeset 39274
- 7acdb1d9797c
- parent 39273
- 820a44d3d618
- child 39466
- 43e2de46c7d5
equal
deleted
inserted
replaced
| 39273:820a44d3d618 | 39274:7acdb1d9797c |
|---|---|
| 1436 | 1436 |
| 1437 if (!(purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_NO_IMAGES)) | 1437 if (!(purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_NO_IMAGES)) |
| 1438 im = TRUE; | 1438 im = TRUE; |
| 1439 | 1439 |
| 1440 if (protocol && PURPLE_IS_PROTOCOL_XFER(protocol)) { | 1440 if (protocol && PURPLE_IS_PROTOCOL_XFER(protocol)) { |
| 1441 PurpleProtocolXferInterface *iface = PURPLE_PROTOCOL_XFER(protocol); | 1441 PurpleProtocolXferInterface *iface = |
| 1442 PURPLE_PROTOCOL_XFER_GET_IFACE(protocol); | |
| 1442 | 1443 |
| 1443 if(iface->can_receive) { | 1444 if(iface->can_receive) { |
| 1444 ft = purple_protocol_xfer_can_receive(protocol, gc, who); | 1445 ft = purple_protocol_xfer_can_receive( |
| 1446 PURPLE_PROTOCOL_XFER(protocol), | |
| 1447 gc, who); | |
| 1445 } else { | 1448 } else { |
| 1446 ft = (iface->send_file) ? TRUE : FALSE; | 1449 ft = (iface->send_file) ? TRUE : FALSE; |
| 1447 } | 1450 } |
| 1448 } | 1451 } |
| 1449 | 1452 |
| 2354 "conversion: %s\n", path, error->message); | 2357 "conversion: %s\n", path, error->message); |
| 2355 g_error_free(error); | 2358 g_error_free(error); |
| 2356 g_strfreev(protocol_formats); | 2359 g_strfreev(protocol_formats); |
| 2357 return NULL; | 2360 return NULL; |
| 2358 } | 2361 } |
| 2359 original = g_object_ref(G_OBJECT(pixbuf)); | 2362 original = g_object_ref(pixbuf); |
| 2360 | 2363 |
| 2361 new_width = orig_width; | 2364 new_width = orig_width; |
| 2362 new_height = orig_height; | 2365 new_height = orig_height; |
| 2363 | 2366 |
| 2364 /* Make sure the image is the correct dimensions */ | 2367 /* Make sure the image is the correct dimensions */ |
