Mercurial > pidgin
changeset 32106:285db86fcf99
load the default variant. Bring back basestyle.css.
| author | tdrhq@soc.pidgin.im |
|---|---|
| date | Fri, 14 Aug 2009 04:47:16 +0000 |
| parents | 59f433824040 |
| children | 5281f3b3ef4c |
| files | pidgin/plugins/adiumthemes/message-style.c pidgin/plugins/adiumthemes/message-style.h pidgin/plugins/adiumthemes/webkit.c |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/adiumthemes/message-style.c Fri Aug 14 02:51:41 2009 +0000 +++ b/pidgin/plugins/adiumthemes/message-style.c Fri Aug 14 04:47:16 2009 +0000 @@ -87,6 +87,8 @@ g_free (style->image_mask); style->image_mask = NULL; + g_free (style->default_variant); + style->default_variant = NULL; }
--- a/pidgin/plugins/adiumthemes/message-style.h Fri Aug 14 02:51:41 2009 +0000 +++ b/pidgin/plugins/adiumthemes/message-style.h Fri Aug 14 04:47:16 2009 +0000 @@ -29,7 +29,8 @@ char *default_background_color; gboolean allow_text_colors; char *image_mask; - + char *default_variant; + /* paths */ char *style_dir; char *template_path;
--- a/pidgin/plugins/adiumthemes/webkit.c Fri Aug 14 02:51:41 2009 +0000 +++ b/pidgin/plugins/adiumthemes/webkit.c Fri Aug 14 04:47:16 2009 +0000 @@ -261,7 +261,7 @@ g_string_append(str, ms[1]); - /* I'm just going to skip main.css at this point */ + g_string_append(str, style->basestyle_css); g_string_append(str, ms[2]);