# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 985602413 0
# Node ID 23b734cf11611d357fa7ededd83d4c72c34de538
# Parent  f1a019d30e01d696d53b4c0b15251951d10ab209
[gaim-migrate @ 1657]
patches by decklin, mishan made this work.

committer: Tailor Script <tailor@pidgin.im>

diff -r f1a019d30e01 -r 23b734cf1161 ChangeLog
--- a/ChangeLog	Mon Mar 26 08:43:35 2001 +0000
+++ b/ChangeLog	Mon Mar 26 10:26:53 2001 +0000
@@ -3,6 +3,8 @@
 version 0.11.0-pre9:
 	* Can register Jabber accounts (load the Jabber plugin and click
 	  Register on the login window)
+	* GtkIMHtml handles themes (no background pixmaps though) (thanks
+	  decklin, mishan)
 
 version 0.11.0-pre8 (03/23/2001):
 	* Fixed a problem with MSN not detecting signoffs and buddy updates.
diff -r f1a019d30e01 -r 23b734cf1161 src/conversation.c
--- a/src/conversation.c	Mon Mar 26 08:43:35 2001 +0000
+++ b/src/conversation.c	Mon Mar 26 10:26:53 2001 +0000
@@ -1900,6 +1900,7 @@
 	GtkWidget *toolbar;
 	GtkWidget *hbox;
 	GtkWidget *label;
+	GtkStyle *style;
 	int dispstyle = set_dispstyle(0);
 
 	c->font_dialog = NULL;
@@ -2089,6 +2090,10 @@
 
 	update_buttons_by_protocol(c);
 
+	style = gtk_widget_get_style(GTK_WIDGET(entry));
+	gtk_imhtml_set_defaults(GTK_IMHTML(text), 0, &style->fg[GTK_STATE_NORMAL],
+				&style->base[GTK_STATE_NORMAL]);
+							
 	gtk_widget_show(win);
 }
 
diff -r f1a019d30e01 -r 23b734cf1161 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Mon Mar 26 08:43:35 2001 +0000
+++ b/src/gtkimhtml.c	Mon Mar 26 10:26:53 2001 +0000
@@ -55,7 +55,7 @@
 
 #define DIFF(a, b) (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
 #define COLOR_MOD  0x8000
-#define COLOR_DIFF 0x80
+#define COLOR_DIFF 0x800
 
 #define TYPE_TEXT     0
 #define TYPE_SMILEY   1
@@ -1598,6 +1598,7 @@
 		if (imhtml->default_bg_color)
 			gdk_color_free (imhtml->default_bg_color);
 		imhtml->default_bg_color = gdk_color_copy (bg_color);
+		gdk_window_set_background (GTK_LAYOUT (imhtml)->bin_window, imhtml->default_bg_color);
 	}
 }