comparison src/protocols/yahoo/yahoo.c @ 4731:6f0ecc21db46

[gaim-migrate @ 5044] no one saw this, right? :-P committer: Tailor Script <[e-mail]>

4730:9d3b7b106def

static char *yahoo_tooltip_text(struct buddy *b)
{
	struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
	if (b->uc & UC_UNAVAILABLE) {
	       	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;
	struct proto_buddy_menu *pbm;
	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;

4731:6f0ecc21db46

static char *yahoo_tooltip_text(struct buddy *b)
{
	struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
	if (b->uc & UC_UNAVAILABLE) {
		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));
	}
	return NULL;
}

static GList *yahoo_buddy_menu(struct gaim_connection *gc, char *who)
{
	GList *m = NULL;
	struct proto_buddy_menu *pbm;
	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;