# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 965104664 0
# Node ID 8d6e2de1fb64ff3aa12e56aa536a0cace6ec6147
# Parent  db6d5d24d9a163a52b36c0cc0bcfa240fe0eb972
[gaim-migrate @ 573]
mods to how buttons work

committer: Tailor Script <tailor@pidgin.im>

diff -r db6d5d24d9a1 -r 8d6e2de1fb64 src/conversation.c
--- 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)