Mercurial > pidgin.yaz
comparison libpurple/blist.c @ 27579:c7812bda30f1
Fix a warning.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 02:59:46 +0000 |
parents | 3bb1085235d0 |
children | 36aa9ed8cd39 |
comparison
equal
deleted
inserted
replaced
27578:3bb1085235d0 | 27579:c7812bda30f1 |
---|---|
81 char *name; | 81 char *name; |
82 PurpleAccount *account; | 82 PurpleAccount *account; |
83 PurpleBlistNode *group; | 83 PurpleBlistNode *group; |
84 }; | 84 }; |
85 | 85 |
86 /* This function must not use purple_normalize */ | |
86 static guint _purple_blist_hbuddy_hash(struct _purple_hbuddy *hb) | 87 static guint _purple_blist_hbuddy_hash(struct _purple_hbuddy *hb) |
87 { | 88 { |
88 return g_str_hash(hb->name); | 89 return g_str_hash(hb->name); |
89 } | 90 } |
90 | 91 |
92 /* This function must not use purple_normalize */ | |
91 static guint _purple_blist_hbuddy_equal(struct _purple_hbuddy *hb1, struct _purple_hbuddy *hb2) | 93 static guint _purple_blist_hbuddy_equal(struct _purple_hbuddy *hb1, struct _purple_hbuddy *hb2) |
92 { | 94 { |
93 return (purple_strequal(hb1->name, hb2->name) && hb1->account == hb2->account && hb1->group == hb2->group); | 95 return (purple_strequal(hb1->name, hb2->name) && hb1->account == hb2->account && hb1->group == hb2->group); |
94 } | 96 } |
95 | 97 |
2350 g_return_val_if_fail(purplebuddylist != NULL, NULL); | 2352 g_return_val_if_fail(purplebuddylist != NULL, NULL); |
2351 g_return_val_if_fail(account != NULL, NULL); | 2353 g_return_val_if_fail(account != NULL, NULL); |
2352 g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL); | 2354 g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL); |
2353 | 2355 |
2354 hb.account = account; | 2356 hb.account = account; |
2355 hb.name = purple_normalize(account, name); | 2357 hb.name = (gchar *)purple_normalize(account, name); |
2356 | 2358 |
2357 for (group = purplebuddylist->root; group; group = group->next) { | 2359 for (group = purplebuddylist->root; group; group = group->next) { |
2358 hb.group = group; | 2360 hb.group = group; |
2359 if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb))) { | 2361 if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb))) { |
2360 return buddy; | 2362 return buddy; |