Mercurial > pidgin.yaz
changeset 6030:54c37db13279
[gaim-migrate @ 6480]
How did I not commit the Send As menu fix?
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sat, 05 Jul 2003 08:00:53 +0000 |
| parents | 38999b6b1838 |
| children | 855026933d50 |
| files | src/conversation.c src/gtkconv.c |
| diffstat | 2 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sat Jul 05 07:36:09 2003 +0000 +++ b/src/conversation.c Sat Jul 05 08:00:53 2003 +0000 @@ -963,15 +963,16 @@ } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { /* - * This is unfortunately necessary, because calling serv_chat_leave() - * calls this gaim_conversation_destroy(), which leads to two calls - * here.. We can't just return after this, because then it'll return - * on the next pass. So, since serv_got_chat_left(), which is - * eventually called from the prpl that serv_chat_leave() calls, - * removes this conversation from the gc's buddy_chats list, we're - * going to check to see if this exists in the list. If so, we want - * to return after calling this, because it'll be called again. If not, - * fall through, because it'll have already been removed, and we'd + * This is unfortunately necessary, because calling + * serv_chat_leave() calls this gaim_conversation_destroy(), + * which leads to two calls here.. We can't just return after + * this, because then it'll return on the next pass. So, since + * serv_got_chat_left(), which is eventually called from the + * prpl that serv_chat_leave() calls, removes this conversation + * from the gc's buddy_chats list, we're going to check to see + * if this exists in the list. If so, we want to return after + * calling this, because it'll be called again. If not, fall + * through, because it'll have already been removed, and we'd * be on the 2nd pass. * * Long paragraph. <-- Short sentence.
--- a/src/gtkconv.c Sat Jul 05 07:36:09 2003 +0000 +++ b/src/gtkconv.c Sat Jul 05 08:00:53 2003 +0000 @@ -1934,7 +1934,7 @@ if (gtkwin->menu.send_as != NULL) g_timeout_add(0, (GSourceFunc)update_send_as_selection, win); } - else { + else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { gtk_widget_show(gtkwin->menu.invite); gtk_widget_hide(gtkwin->menu.view_log); @@ -1963,7 +1963,7 @@ gtk_widget_set_sensitive(gtkwin->menu.remove, FALSE); if (gtkwin->menu.send_as != NULL) - gtk_widget_hide(gtkwin->menu.send_as); + g_timeout_add(0, (GSourceFunc)update_send_as_selection, win); } update_typing_icon(conv); @@ -2232,6 +2232,7 @@ break; } } + return FALSE; }