comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36626
- 18fc361b3704
- parent 36607
- 7ad7681dcfd8
- child 36633
- 2dcb81a189bd
equal
deleted
inserted
replaced
| 36625:e6febbd8cbec | 36626:18fc361b3704 |
|---|---|
| 493 switch (param_id) { | 493 switch (param_id) { |
| 494 case PROP_ICON_SEL: | 494 case PROP_ICON_SEL: |
| 495 if (g_value_get_boolean(value)) { | 495 if (g_value_get_boolean(value)) { |
| 496 if (statusbox->account) { | 496 if (statusbox->account) { |
| 497 PurpleProtocol *protocol = | 497 PurpleProtocol *protocol = |
| 498 purple_find_protocol_info(purple_account_get_protocol_id(statusbox->account)); | 498 purple_protocols_find(purple_account_get_protocol_id(statusbox->account)); |
| 499 if (protocol && purple_protocol_get_icon_spec(protocol).format != NULL) | 499 if (protocol && purple_protocol_get_icon_spec(protocol).format != NULL) |
| 500 setup_icon_box(statusbox); | 500 setup_icon_box(statusbox); |
| 501 } else { | 501 } else { |
| 502 setup_icon_box(statusbox); | 502 setup_icon_box(statusbox); |
| 503 } | 503 } |
| 1449 { | 1449 { |
| 1450 PurpleStoredImage *img = NULL; | 1450 PurpleStoredImage *img = NULL; |
| 1451 | 1451 |
| 1452 if (box->account) { | 1452 if (box->account) { |
| 1453 PurpleProtocol *protocol = | 1453 PurpleProtocol *protocol = |
| 1454 purple_find_protocol_info(purple_account_get_protocol_id(box->account)); | 1454 purple_protocols_find(purple_account_get_protocol_id(box->account)); |
| 1455 if (protocol && purple_protocol_get_icon_spec(protocol).format) { | 1455 if (protocol && purple_protocol_get_icon_spec(protocol).format) { |
| 1456 gpointer data = NULL; | 1456 gpointer data = NULL; |
| 1457 size_t len = 0; | 1457 size_t len = 0; |
| 1458 if (filename) | 1458 if (filename) |
| 1459 data = pidgin_convert_buddy_icon(protocol, filename, &len); | 1459 data = pidgin_convert_buddy_icon(protocol, filename, &len); |
| 1472 } else { | 1472 } else { |
| 1473 GList *accounts; | 1473 GList *accounts; |
| 1474 for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) { | 1474 for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) { |
| 1475 PurpleAccount *account = accounts->data; | 1475 PurpleAccount *account = accounts->data; |
| 1476 PurpleProtocol *protocol = | 1476 PurpleProtocol *protocol = |
| 1477 purple_find_protocol_info(purple_account_get_protocol_id(account)); | 1477 purple_protocols_find(purple_account_get_protocol_id(account)); |
| 1478 if (protocol != NULL && | 1478 if (protocol != NULL && |
| 1479 purple_account_get_bool(account, "use-global-buddyicon", TRUE) && | 1479 purple_account_get_bool(account, "use-global-buddyicon", TRUE) && |
| 1480 purple_protocol_get_icon_spec(protocol).format) { | 1480 purple_protocol_get_icon_spec(protocol).format) { |
| 1481 gpointer data = NULL; | 1481 gpointer data = NULL; |
| 1482 size_t len = 0; | 1482 size_t len = 0; |
