Mercurial > pidgin
comparison libpurple/protocols/yahoo/yahoo.c @ 22239:1ca7a70f1faa
Use the group passed into yahoo_add_buddy() instead of looking
it up ourselves.
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 31 Jan 2008 23:27:59 +0000 |
parents | 4cc1dfbc499b |
children | d5b65bead569 |
comparison
equal
deleted
inserted
replaced
22238:4cc1dfbc499b | 22239:1ca7a70f1faa |
---|---|
3846 pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0); | 3846 pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0); |
3847 yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc)); | 3847 yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc)); |
3848 yahoo_packet_send_and_free(pkt, yd); | 3848 yahoo_packet_send_and_free(pkt, yd); |
3849 } | 3849 } |
3850 | 3850 |
3851 /* XXX - What's the deal with PurpleGroup *foo? */ | 3851 static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g) |
3852 static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *foo) | |
3853 { | 3852 { |
3854 struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; | 3853 struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; |
3855 struct yahoo_packet *pkt; | 3854 struct yahoo_packet *pkt; |
3856 PurpleGroup *g; | |
3857 const char *group = NULL; | 3855 const char *group = NULL; |
3858 char *group2; | 3856 char *group2; |
3859 YahooFriend *f; | 3857 YahooFriend *f; |
3860 | 3858 |
3861 if (!yd->logged_in) | 3859 if (!yd->logged_in) |
3865 purple_buddy_get_name(buddy))) | 3863 purple_buddy_get_name(buddy))) |
3866 return; | 3864 return; |
3867 | 3865 |
3868 f = yahoo_friend_find(gc, purple_buddy_get_name(buddy)); | 3866 f = yahoo_friend_find(gc, purple_buddy_get_name(buddy)); |
3869 | 3867 |
3870 if (foo) | 3868 g = purple_buddy_get_group(buddy); |
3871 group = foo->name; | 3869 if (g) |
3872 if (!group) { | 3870 group = g->name; |
3873 g = purple_buddy_get_group(buddy); | 3871 else |
3874 if (g) | 3872 group = "Buddies"; |
3875 group = g->name; | |
3876 else | |
3877 group = "Buddies"; | |
3878 } | |
3879 | 3873 |
3880 group2 = yahoo_string_encode(gc, group, NULL); | 3874 group2 = yahoo_string_encode(gc, group, NULL); |
3881 pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, 0); | 3875 pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, 0); |
3882 yahoo_packet_hash(pkt, "ssssssssss", | 3876 yahoo_packet_hash(pkt, "ssssssssss", |
3883 14, "", | 3877 14, "", |