Mercurial > pidgin
changeset 4730:9d3b7b106def
[gaim-migrate @ 5043]
Fixed a pair of bugs.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 12 Mar 2003 23:19:39 +0000 |
| parents | 751c37a940dd |
| children | 6f0ecc21db46 |
| files | src/buddy.c src/protocols/yahoo/yahoo.c |
| diffstat | 2 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Wed Mar 12 21:43:39 2003 +0000 +++ b/src/buddy.c Wed Mar 12 23:19:39 2003 +0000 @@ -433,7 +433,7 @@ return FALSE; } -static void gaim_gtk_blist_motion_cb (GtkWidget *tv, GdkEventMotion *event, gpointer null) +static gboolean gaim_gtk_blist_motion_cb (GtkWidget *tv, GdkEventMotion *event, gpointer null) { GtkTreePath *path; @@ -454,6 +454,7 @@ if (path) gtk_tree_path_free(path); gtkblist->timeout = g_timeout_add(500, (GSourceFunc)gaim_gtk_blist_tooltip_timeout, tv); + return FALSE; } static void gaim_gtk_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
--- a/src/protocols/yahoo/yahoo.c Wed Mar 12 21:43:39 2003 +0000 +++ b/src/protocols/yahoo/yahoo.c Wed Mar 12 23:19:39 2003 +0000 @@ -1043,6 +1043,8 @@ return _("Stepped Out"); case YAHOO_STATUS_INVISIBLE: return _("Invisible"); + case YAHOO_STATUS_IDLE: + return _("Idle"); default: return _("Online"); } @@ -1068,8 +1070,8 @@ static const char *yahoo_status_text(struct buddy *b) { struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data; - if (b->uc & UC_UNAVAILABLE && b->uc >> 2 != YAHOO_STATUS_IDLE) { - if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) + if (b->uc & UC_UNAVAILABLE) { + if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) return yahoo_get_status_string(b->uc >> 2); else return g_hash_table_lookup(yd->hash, b->name); @@ -1080,15 +1082,22 @@ 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 && b->uc >> 2 != YAHOO_STATUS_IDLE) { - if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) + 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;