comparison src/protocols/jabber/roster.c @ 10725:de26e6e198a4

[gaim-migrate @ 12325] " With the status rewrite we don't need some of these old legacy members in the buddy structure. I'm trying to clean them up by novell hasn't been ported to the new status, and I have nfi what I'm doing with novell.. So here's jabber." -- grim committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 25 Mar 2005 13:13:16 +0000
parents 5683613ea692
children cef48e318125
comparison
equal deleted inserted replaced
10724:811f12c8a5e4 10725:de26e6e198a4
52 } 52 }
53 53
54 static void add_gaim_buddies_in_groups(JabberStream *js, const char *jid, 54 static void add_gaim_buddies_in_groups(JabberStream *js, const char *jid,
55 const char *alias, GSList *groups) 55 const char *alias, GSList *groups)
56 { 56 {
57 GaimPresence *presence = NULL;
57 GSList *buddies, *g2, *l; 58 GSList *buddies, *g2, *l;
58 int present =0;
59 59
60 buddies = gaim_find_buddies(js->gc->account, jid); 60 buddies = gaim_find_buddies(js->gc->account, jid);
61 61
62 g2 = groups; 62 g2 = groups;
63 63
67 else 67 else
68 return; 68 return;
69 } 69 }
70 70
71 if(buddies) { 71 if(buddies) {
72 present = ((GaimBuddy*)buddies->data)->present; 72 presence = gaim_buddy_get_presence((GaimBuddy*)buddies->data);
73 } 73 }
74 74
75 while(buddies) { 75 while(buddies) {
76 GaimBuddy *b = buddies->data; 76 GaimBuddy *b = buddies->data;
77 GaimGroup *g = gaim_find_buddys_group(b); 77 GaimGroup *g = gaim_find_buddys_group(b);
101 g = gaim_group_new(g2->data); 101 g = gaim_group_new(g2->data);
102 gaim_blist_add_group(g, NULL); 102 gaim_blist_add_group(g, NULL);
103 } 103 }
104 104
105 /* XXX: this hack may need to change */ 105 /* XXX: this hack may need to change */
106 b->present = present; 106 /* Is this change better? */
107 b->presence = presence;
107 108
108 gaim_blist_add_buddy(b, NULL, g, NULL); 109 gaim_blist_add_buddy(b, NULL, g, NULL);
109 gaim_blist_alias_buddy(b, alias); 110 gaim_blist_alias_buddy(b, alias);
110 g_free(g2->data); 111 g_free(g2->data);
111 g2 = g_slist_delete_link(g2, g2); 112 g2 = g_slist_delete_link(g2, g2);