diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 21 |
2 files changed, 10 insertions, 17 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index d7e76ad592..9e1f60788c 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,9 @@ +2005-01-22 Nat Friedman <nat@novell.com> + + * gaimbuddies.c (im_list_contains_buddy): Check the buddy account + name, not alias. Duh. + (free_contact_list): Removed. + 2005-01-13 Nat Friedman <nat@novell.com> * gaimbuddies.c (bbdb_sync_buddy_list_check): Remove some debug diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 019686380f..5d9d46e523 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -70,7 +70,6 @@ static GList *bbdb_get_gaim_buddy_list (void); static char *get_node_text (xmlNodePtr node); static char *get_buddy_icon_from_setting (xmlNodePtr setting); static char *get_node_text (xmlNodePtr node); -static void free_contact_list (GList *contacts); static void free_buddy_list (GList *blist); static void parse_buddy_group (xmlNodePtr group, GList **buddies); static EContactField proto_to_contact_field (const char *proto); @@ -209,11 +208,11 @@ static gboolean im_list_contains_buddy (GList *ims, GaimBuddy *b) { GList *l; - + for (l = ims; l != NULL; l = l->next) { char *im = (char *) l->data; - if (! strcmp (im, b->alias)) + if (! strcmp (im, b->account_name)) return TRUE; } @@ -262,10 +261,8 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) } /* Clean up */ - if (photo != NULL) { - g_free (photo->data); - g_free (photo); - } + if (photo != NULL) + e_contact_photo_free (photo); for (l = ims; l != NULL; l = l->next) g_free ((char *) l->data); @@ -293,16 +290,6 @@ proto_to_contact_field (const char *proto) return E_CONTACT_IM_AIM; } -static void -free_contact_list (GList *contacts) -{ - GList *l; - - for (l = contacts; l != NULL; l = l->next) - g_object_unref (G_OBJECT (l->data)); - g_list_free (contacts); -} - static GList * bbdb_get_gaim_buddy_list (void) { |