# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1078934719 0
# Node ID a34fe311787779f07a56f88059a7ee8f10304af8
# Parent  c29b9bede49dbc90430eda3bd9767abb0c032fb3
[gaim-migrate @ 9152]
i think sean may have meant something closer to this

committer: Tailor Script <tailor@pidgin.im>

diff -r c29b9bede49d -r a34fe3117877 src/gtkconv.c
--- a/src/gtkconv.c	Wed Mar 10 06:22:56 2004 +0000
+++ b/src/gtkconv.c	Wed Mar 10 16:05:19 2004 +0000
@@ -2330,18 +2330,18 @@
 		}
 
 		/* Deal with the toolbar */
-		
+
 		if (gc->flags & GAIM_CONNECTION_HTML) {
 			buttons = -1;    /* Everything on */
 			if (!(prpl_info->options & OPT_PROTO_IM_IMAGE))
-				buttons ^= GTK_IMHTML_IMAGE; 
+				buttons &= ~GTK_IMHTML_IMAGE;
 			if (gc->flags & GAIM_CONNECTION_NO_BGCOLOR)
-				buttons ^= GTK_IMHTML_BACKCOLOR;
+				buttons &= ~GTK_IMHTML_BACKCOLOR;
 		} else {
-			buttons = 0;
+			buttons = GTK_IMHTML_SMILEY;
 		}
 		gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons);
-	
+
 #if 0
 		/* Deal with menu items */
 		gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE);