soc.2009.webkitmessageview: f01effe9: load the default variant. Bring back bas...

[tdrhq at soc.pidgin.im]

-----------------------------------------------------------------
Revision: f01effe93dd666800ad333c537ceb1163f525d0a
Ancestor: e100fa206b9212493e2eb4041c437755cbbd2e6e
Author: tdrhq at soc.pidgin.im
Date: 2009-08-14T04:47:16
Branch: im.pidgin.soc.2009.webkitmessageview
URL: http://d.pidgin.im/viewmtn/revision/info/f01effe93dd666800ad333c537ceb1163f525d0a

Modified files:
        pidgin/plugins/adiumthemes/message-style.c
        pidgin/plugins/adiumthemes/message-style.h
        pidgin/plugins/adiumthemes/webkit.c

ChangeLog: 

load the default variant. Bring back basestyle.css.

-------------- next part --------------
============================================================
--- pidgin/plugins/adiumthemes/message-style.c	fea34ca7e487e47b2beccf1ea7d286a56cd6d9a5
+++ pidgin/plugins/adiumthemes/message-style.c	ad834e1d70c741ac42d629de3328d4a1d5962375
@@ -87,6 +87,8 @@ pidgin_message_style_unset_info_plist (P
 	
 	g_free (style->image_mask);
 	style->image_mask = NULL;
+	g_free (style->default_variant);
+	style->default_variant = NULL;
 }
 
 
============================================================
--- pidgin/plugins/adiumthemes/message-style.h	23d4982b98e318e23a25f68b980bfe795802d91d
+++ pidgin/plugins/adiumthemes/message-style.h	d6c25ba662e6ac5d4e9c5b782b031384d0289b85
@@ -29,7 +29,8 @@ typedef struct _PidginMessageStyle {
 	char     *default_background_color;
 	gboolean allow_text_colors;
 	char     *image_mask;
-	
+	char     *default_variant;
+
 	/* paths */
 	char    *style_dir;
 	char    *template_path;
============================================================
--- pidgin/plugins/adiumthemes/webkit.c	17118b34f28156438c9157c6323294f3d7d2d997
+++ pidgin/plugins/adiumthemes/webkit.c	9f45f14be6e286d1020c86f6fbf54cb83471e547
@@ -261,7 +261,7 @@ replace_template_tokens(PidginMessageSty
 
 	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]);