# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1077596984 0
# Node ID 80915fd1634952718ba042a9690cdf376631aa74
# Parent  9dd7c75ed43381e02a2e43d1dfdaa4ecac02201e
[gaim-migrate @ 9054]
// comments are bad in C. I'm not sure why this code wasn't just removed,
though, since it's now in the toolbar code... Oh, and someone needs to set
things up so the conversation code can trigger buttons on the toolbar,
*before* release.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9dd7c75ed433 -r 80915fd16349 src/gtkconv.c
--- a/src/gtkconv.c	Tue Feb 24 04:27:58 2004 +0000
+++ b/src/gtkconv.c	Tue Feb 24 04:29:44 2004 +0000
@@ -2190,9 +2190,6 @@
 		gtk_widget_show(gtkconv->u.im->warn);
 		gtk_widget_show(gtkconv->u.im->block);
 
-		/* Deal with the toolbar */
-		//gtk_widget_show(gtkconv->toolbar.image);
-
 		/* Deal with menu items */
 		gtk_widget_show(gtkwin->menu.view_log);
 		gtk_widget_show(gtkwin->menu.add_pounce);
@@ -2225,9 +2222,6 @@
 		gtk_widget_show(gtkconv->send);
 		gtk_widget_show(gtkconv->u.chat->invite);
 
-		/* Deal with the toolbar */
-		//		gtk_widget_hide(gtkconv->toolbar.image);
-
 		/* Deal with menu items */
 		gtk_widget_hide(gtkwin->menu.view_log);
 		gtk_widget_hide(gtkwin->menu.add_pounce);
@@ -2333,10 +2327,6 @@
 			gtk_widget_set_sensitive(gtkconv->u.chat->invite, FALSE);
 		}
 
-		/* Deal with the toolbar */
-		//gtk_widget_set_sensitive(gtkconv->toolbar.link, TRUE);
-		//gtk_widget_set_sensitive(gtkconv->toolbar.image, FALSE);
-
 		/* Then deal with menu items */
 		gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE);
 		gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE);
@@ -3075,9 +3065,9 @@
 
 	{ "/Conversation/sep3", NULL, NULL, 0, "<Separator>" },
 
-	{ N_("/Conversation/Insert Lin_k..."), NULL, NULL, 0, //menu_insert_link_cb, 0,
+	{ N_("/Conversation/Insert Lin_k..."), NULL, NULL, 0, /* menu_insert_link_cb, 0, */
 	  "<StockItem>", GAIM_STOCK_LINK },
-	{ N_("/Conversation/Insert Imag_e..."), NULL, NULL, 0, //menu_insert_image_cb, 0,
+	{ N_("/Conversation/Insert Imag_e..."), NULL, NULL, 0, /* menu_insert_image_cb, 0, */
 	  "<StockItem>", GAIM_STOCK_IMAGE },
 
 	{ "/Conversation/sep4", NULL, NULL, 0, "<Separator>" },
@@ -4260,24 +4250,6 @@
 {
 	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 
-	/*	if (gtkconv->dialogs.fg_color != NULL)
-		gtk_widget_destroy(gtkconv->dialogs.fg_color);
-
-	if (gtkconv->dialogs.bg_color != NULL)
-		gtk_widget_destroy(gtkconv->dialogs.bg_color);
-
-	if (gtkconv->dialogs.font != NULL)
-		gtk_widget_destroy(gtkconv->dialogs.font);
-
-	if (gtkconv->dialogs.image != NULL)
-		gtk_widget_destroy(gtkconv->dialogs.image);
-
-	if (gtkconv->dialogs.smiley != NULL)
-		gtk_widget_destroy(gtkconv->dialogs.smiley);
-	*/
-	//if (gtkconv->dialogs.link != NULL)
-	//	close_link_dialog(conv);
-
 	if (gtkconv->dialogs.log != NULL)
 		gtk_widget_destroy(gtkconv->dialogs.log);