Mercurial > pidgin.yaz
changeset 1230:5395053cdee1
[gaim-migrate @ 1240]
ok. it works.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 11 Dec 2000 08:11:06 +0000 |
| parents | 229bf438c591 |
| children | 11d67bbda8ae |
| files | src/buddy.c src/dialogs.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Mon Dec 11 07:42:19 2000 +0000 +++ b/src/buddy.c Mon Dec 11 08:11:06 2000 +0000 @@ -1313,11 +1313,10 @@ u = find_user(b->pouncer, b->protocol); /* find our user */ if (u == NULL) continue; + /* check and see if we're signed on as the pouncer */ + if (u->gc == NULL) continue; + if (!strcasecmp(who, normalize(b->name))) { /* find someone to pounce */ - /* check and see if we're signed on as the pouncer */ - - if (u->gc == NULL) continue; - if (b->popup == 1) { c = find_conversation(name);
--- a/src/dialogs.c Mon Dec 11 07:42:19 2000 +0000 +++ b/src/dialogs.c Mon Dec 11 08:11:06 2000 +0000 @@ -1105,6 +1105,7 @@ gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), g_list_index(aim_users, ((struct gaim_connection *)connections->data)->user)); + b->user = ((struct gaim_connection *)connections->data)->user; b->menu = optmenu; }