changeset 8422:a34fe3117877

[gaim-migrate @ 9152] i think sean may have meant something closer to this committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Wed, 10 Mar 2004 16:05:19 +0000
parents c29b9bede49d
children d48014d683ab
files src/gtkconv.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);