Mercurial > pidgin.yaz
changeset 563:8d6e2de1fb64
[gaim-migrate @ 573]
mods to how buttons work
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 01 Aug 2000 04:37:44 +0000 |
| parents | db6d5d24d9a1 |
| children | c6f1e88ec3cb |
| files | src/conversation.c |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Tue Aug 01 04:13:08 2000 +0000 +++ b/src/conversation.c Tue Aug 01 04:37:44 2000 +0000 @@ -321,7 +321,10 @@ if (state_lock) return; - show_smiley_dialog(c, NULL); + if (c->smiley_dialog) + close_smiley_dialog(widget, c); + else + show_smiley_dialog(c, NULL); return; } @@ -756,6 +759,8 @@ return; if (GTK_TOGGLE_BUTTON(color)->active) show_color_dialog(c, color); + else if (c->color_dialog) + cancel_color(color, c); else advance_past(c->entry, "<FONT COLOR>", "</FONT>" ); } @@ -766,10 +771,10 @@ return; if (GTK_TOGGLE_BUTTON(font)->active) show_font_dialog(c, font); + else if (c->font_dialog) + cancel_font(font, c); else advance_past(c->entry, "<FONT FACE>", "</FONT>"); - - return; } void do_link(GtkWidget *linky, GtkWidget *entry)