Mercurial > pidgin.yaz
changeset 4731:6f0ecc21db46
[gaim-migrate @ 5044]
no one saw this, right? :-P
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Thu, 13 Mar 2003 00:10:56 +0000 |
| parents | 9d3b7b106def |
| children | c15e0699acae |
| files | src/protocols/yahoo/yahoo.c |
| diffstat | 1 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c Wed Mar 12 23:19:39 2003 +0000 +++ b/src/protocols/yahoo/yahoo.c Thu Mar 13 00:10:56 2003 +0000 @@ -1083,21 +1083,14 @@ { struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data; if (b->uc & UC_UNAVAILABLE) { - if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) + if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) return g_strdup(yahoo_get_status_string(b->uc >> 2)); else return g_strdup(g_hash_table_lookup(yd->hash, b->name)); -<<<<<<< yahoo.c - } - return NULL; -} - -======= } return NULL; } ->>>>>>> 1.76 static GList *yahoo_buddy_menu(struct gaim_connection *gc, char *who) { GList *m = NULL;