Mercurial > pidgin
comparison libpurple/buddyicon.c @ 25918:bc8d1607f9b8
propagate from branch 'im.pidgin.pidgin' (head 566d2e86bfd45c806aba1b32d6f85a9a409ff9ea)
to branch 'im.pidgin.pidgin.next.minor' (head ffd76856f93610f7cd6178e943d0b61e4220b549)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 26 Jan 2009 02:39:55 +0000 |
| parents | a6e3cb32cdd2 |
| children | 584063555949 |
comparison
equal
deleted
inserted
replaced
| 25372:a8db457c421a | 25918:bc8d1607f9b8 |
|---|---|
| 887 else | 887 else |
| 888 g_hash_table_remove(pointer_icon_cache, node); | 888 g_hash_table_remove(pointer_icon_cache, node); |
| 889 | 889 |
| 890 if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { | 890 if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { |
| 891 PurpleBlistNode *child; | 891 PurpleBlistNode *child; |
| 892 for (child = node->child ; child ; child = child->next) | 892 for (child = purple_blist_node_get_first_child(node); |
| 893 child; | |
| 894 child = purple_blist_node_get_sibling_next(child)) | |
| 893 { | 895 { |
| 894 PurpleBuddy *buddy; | 896 PurpleBuddy *buddy; |
| 895 PurpleConversation *conv; | 897 PurpleConversation *conv; |
| 896 | 898 |
| 897 if (!PURPLE_BLIST_NODE_IS_BUDDY(child)) | 899 if (!PURPLE_BLIST_NODE_IS_BUDDY(child)) |
| 984 static void | 986 static void |
| 985 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name) | 987 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name) |
| 986 { | 988 { |
| 987 purple_blist_node_remove_setting(node, setting_name); | 989 purple_blist_node_remove_setting(node, setting_name); |
| 988 | 990 |
| 989 if (!strcmp(setting_name, "buddy_icon")) | 991 if (purple_strequal(setting_name, "buddy_icon")) |
| 990 { | 992 { |
| 991 purple_blist_node_remove_setting(node, "avatar_hash"); | 993 purple_blist_node_remove_setting(node, "avatar_hash"); |
| 992 purple_blist_node_remove_setting(node, "icon_checksum"); | 994 purple_blist_node_remove_setting(node, "icon_checksum"); |
| 993 } | 995 } |
| 994 } | 996 } |
| 1081 new_filename); | 1083 new_filename); |
| 1082 ref_filename(new_filename); | 1084 ref_filename(new_filename); |
| 1083 | 1085 |
| 1084 g_free(new_filename); | 1086 g_free(new_filename); |
| 1085 | 1087 |
| 1086 if (!strcmp(setting_name, "buddy_icon")) | 1088 if (purple_strequal(setting_name, "buddy_icon")) |
| 1087 { | 1089 { |
| 1088 const char *hash; | 1090 const char *hash; |
| 1089 | 1091 |
| 1090 hash = purple_blist_node_get_string(node, "avatar_hash"); | 1092 hash = purple_blist_node_get_string(node, "avatar_hash"); |
| 1091 if (hash != NULL) | 1093 if (hash != NULL) |
| 1096 else | 1098 else |
| 1097 { | 1099 { |
| 1098 PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); | 1100 PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); |
| 1099 const char *prpl_id = purple_account_get_protocol_id(account); | 1101 const char *prpl_id = purple_account_get_protocol_id(account); |
| 1100 | 1102 |
| 1101 if (!strcmp(prpl_id, "prpl-yahoo")) | 1103 if (purple_strequal(prpl_id, "prpl-yahoo")) |
| 1102 { | 1104 { |
| 1103 int checksum = purple_blist_node_get_int(node, "icon_checksum"); | 1105 int checksum = purple_blist_node_get_int(node, "icon_checksum"); |
| 1104 if (checksum != 0) | 1106 if (checksum != 0) |
| 1105 { | 1107 { |
| 1106 char *checksum_str = g_strdup_printf("%i", checksum); | 1108 char *checksum_str = g_strdup_printf("%i", checksum); |