comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36719
- 0d7682bdf828
- parent 36716
- 94a965c18f01
- child 36725
- f17f9d4e710e
equal
deleted
inserted
replaced
| 36718:24f9c085897a | 36719:0d7682bdf828 |
|---|---|
| 557 GdkPixbuf *pixbuf; | 557 GdkPixbuf *pixbuf; |
| 558 | 558 |
| 559 if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon)) | 559 if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon)) |
| 560 return NULL; | 560 return NULL; |
| 561 | 561 |
| 562 protoname = purple_protocol_iface_list_icon(protocol, account, NULL); | 562 protoname = purple_protocol_class_list_icon(protocol, account, NULL); |
| 563 if (protoname == NULL) | 563 if (protoname == NULL) |
| 564 return NULL; | 564 return NULL; |
| 565 | 565 |
| 566 /* | 566 /* |
| 567 * Status icons will be themeable too, and then it will look up | 567 * Status icons will be themeable too, and then it will look up |
| 919 return; | 919 return; |
| 920 } | 920 } |
| 921 | 921 |
| 922 protocol = purple_connection_get_protocol(conn); | 922 protocol = purple_connection_get_protocol(conn); |
| 923 if (protocol != NULL) | 923 if (protocol != NULL) |
| 924 who = purple_protocol_iface_get_cuser_real_name(protocol, conn, chat, name); | 924 who = purple_protocol_chat_iface_get_user_real_name(protocol, conn, chat, name); |
| 925 | 925 |
| 926 pidgin_retrieve_user_info(conn, who ? who : name); | 926 pidgin_retrieve_user_info(conn, who ? who : name); |
| 927 g_free(who); | 927 g_free(who); |
| 928 } | 928 } |
| 929 | 929 |
| 1037 account = purple_connection_get_account(gc); | 1037 account = purple_connection_get_account(gc); |
| 1038 | 1038 |
| 1039 protocol = purple_connection_get_protocol(gc); | 1039 protocol = purple_connection_get_protocol(gc); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 protoname = purple_protocol_iface_list_icon(protocol, account, NULL); | 1042 protoname = purple_protocol_class_list_icon(protocol, account, NULL); |
| 1043 | 1043 |
| 1044 if (!strcmp(protoname, protocol_id)) | 1044 if (!strcmp(protoname, protocol_id)) |
| 1045 break; | 1045 break; |
| 1046 | 1046 |
| 1047 account = NULL; | 1047 account = NULL; |
| 1076 account = purple_connection_get_account(gc); | 1076 account = purple_connection_get_account(gc); |
| 1077 | 1077 |
| 1078 protocol = purple_connection_get_protocol(gc); | 1078 protocol = purple_connection_get_protocol(gc); |
| 1079 } | 1079 } |
| 1080 | 1080 |
| 1081 protoname = purple_protocol_iface_list_icon(protocol, account, NULL); | 1081 protoname = purple_protocol_class_list_icon(protocol, account, NULL); |
| 1082 | 1082 |
| 1083 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) | 1083 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) |
| 1084 break; | 1084 break; |
| 1085 | 1085 |
| 1086 account = NULL; | 1086 account = NULL; |
| 1488 | 1488 |
| 1489 if (protocol && purple_protocol_get_options(protocol) & OPT_PROTO_IM_IMAGE) | 1489 if (protocol && purple_protocol_get_options(protocol) & OPT_PROTO_IM_IMAGE) |
| 1490 im = TRUE; | 1490 im = TRUE; |
| 1491 | 1491 |
| 1492 if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file)) | 1492 if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file)) |
| 1493 ft = purple_protocol_iface_can_receive_file(protocol, gc, who); | 1493 ft = purple_protocol_xfer_iface_can_receive(protocol, gc, who); |
| 1494 else if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file)) | 1494 else if (protocol && PURPLE_PROTOCOL_IMPLEMENTS(protocol, send_file)) |
| 1495 ft = TRUE; | 1495 ft = TRUE; |
| 1496 | 1496 |
| 1497 if (im && ft) | 1497 if (im && ft) |
| 1498 purple_request_choice(NULL, NULL, | 1498 purple_request_choice(NULL, NULL, |
