comparison: libpurple/buddyicon.c
libpurple/buddyicon.c
- branch
- next.minor
- changeset 25859
- b42be7bb9dac
- parent 24955
- 77727fac30c6
- child 25888
- d0fdd378a635
equal
deleted
inserted
replaced
| 25857:f40a2e40f651 | 25859:b42be7bb9dac |
|---|---|
| 986 static void | 986 static void |
| 987 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name) | 987 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name) |
| 988 { | 988 { |
| 989 purple_blist_node_remove_setting(node, setting_name); | 989 purple_blist_node_remove_setting(node, setting_name); |
| 990 | 990 |
| 991 if (!strcmp(setting_name, "buddy_icon")) | 991 if (purple_strequal(setting_name, "buddy_icon")) |
| 992 { | 992 { |
| 993 purple_blist_node_remove_setting(node, "avatar_hash"); | 993 purple_blist_node_remove_setting(node, "avatar_hash"); |
| 994 purple_blist_node_remove_setting(node, "icon_checksum"); | 994 purple_blist_node_remove_setting(node, "icon_checksum"); |
| 995 } | 995 } |
| 996 } | 996 } |
| 1083 new_filename); | 1083 new_filename); |
| 1084 ref_filename(new_filename); | 1084 ref_filename(new_filename); |
| 1085 | 1085 |
| 1086 g_free(new_filename); | 1086 g_free(new_filename); |
| 1087 | 1087 |
| 1088 if (!strcmp(setting_name, "buddy_icon")) | 1088 if (purple_strequal(setting_name, "buddy_icon")) |
| 1089 { | 1089 { |
| 1090 const char *hash; | 1090 const char *hash; |
| 1091 | 1091 |
| 1092 hash = purple_blist_node_get_string(node, "avatar_hash"); | 1092 hash = purple_blist_node_get_string(node, "avatar_hash"); |
| 1093 if (hash != NULL) | 1093 if (hash != NULL) |
| 1098 else | 1098 else |
| 1099 { | 1099 { |
| 1100 PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); | 1100 PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); |
| 1101 const char *prpl_id = purple_account_get_protocol_id(account); | 1101 const char *prpl_id = purple_account_get_protocol_id(account); |
| 1102 | 1102 |
| 1103 if (!strcmp(prpl_id, "prpl-yahoo")) | 1103 if (purple_strequal(prpl_id, "prpl-yahoo")) |
| 1104 { | 1104 { |
| 1105 int checksum = purple_blist_node_get_int(node, "icon_checksum"); | 1105 int checksum = purple_blist_node_get_int(node, "icon_checksum"); |
| 1106 if (checksum != 0) | 1106 if (checksum != 0) |
| 1107 { | 1107 { |
| 1108 char *checksum_str = g_strdup_printf("%i", checksum); | 1108 char *checksum_str = g_strdup_printf("%i", checksum); |
