Mercurial > pidgin
changeset 814:a636ac51d15b
[gaim-migrate @ 824]
i think i finally fixed the chat problems with oscar.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 31 Aug 2000 21:33:12 +0000 |
| parents | d06bed40a86b |
| children | 4544fe6c492f |
| files | src/buddy_chat.c src/conversation.c src/gaim.h |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy_chat.c Thu Aug 31 21:13:54 2000 +0000 +++ b/src/buddy_chat.c Thu Aug 31 21:33:12 2000 +0000 @@ -667,6 +667,7 @@ b->smiley_dialog = NULL; b->link_dialog = NULL; b->log_dialog = NULL; + b->close = close; sprintf(b->fontface, "%s", fontface); b->hasfont = 0; b->bgcol = bgcolor;
--- a/src/conversation.c Thu Aug 31 21:13:54 2000 +0000 +++ b/src/conversation.c Thu Aug 31 21:33:12 2000 +0000 @@ -350,6 +350,16 @@ int close_callback(GtkWidget *widget, struct conversation *c) { + if (c->is_chat && (widget == c->close)) { + GtkWidget *tmp = c->window; + debug_print("chat clicked close button\n"); + c->window = NULL; + gtk_widget_destroy(tmp); + return; + } + + debug_print("conversation close callback\n"); + if (c->window) gtk_widget_destroy(c->window); c->window = NULL;
--- a/src/gaim.h Thu Aug 31 21:13:54 2000 +0000 +++ b/src/gaim.h Thu Aug 31 21:33:12 2000 +0000 @@ -294,6 +294,7 @@ GList *ignored; int id; GtkWidget *list; + GtkWidget *close; /* something to distinguish */ gboolean is_chat; @@ -402,7 +403,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 818 $" +#define REVISION "gaim:$Revision: 824 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc"