Mercurial > pidgin
changeset 1647:23b734cf1161
[gaim-migrate @ 1657]
patches by decklin, mishan made this work.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 26 Mar 2001 10:26:53 +0000 |
| parents | f1a019d30e01 |
| children | 09445224e2d9 |
| files | ChangeLog src/conversation.c src/gtkimhtml.c |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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); }
--- 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); } }